mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

tag: xmp: fix leaks in error code paths

Browse source 
CID 1212133
This commit is contained in:
Tim-Philipp Müller 2014-05-09 15:32:18 +01:00
parent 446f9bf6bd
commit 3f68f522ee
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/tag/gstxmptag.c
View file

@ -1181,7 +1181,7 @@ gst_tag_list_from_xmp_buffer (GstBuffer * buffer)
gchar *xps, *xp1, *xp2, *xpe, *ns, *ne; gchar *xps, *xp1, *xp2, *xpe, *ns, *ne;
gsize len, max_ft_len; gsize len, max_ft_len;
gboolean in_tag; gboolean in_tag;
gchar *part, *pp; gchar *part = NULL, *pp;
guint i; guint i;
XmpTag *last_xmp_tag = NULL; XmpTag *last_xmp_tag = NULL;
GSList *pending_tags = NULL; GSList *pending_tags = NULL;
@ -1249,7 +1249,7 @@ gst_tag_list_from_xmp_buffer (GstBuffer * buffer)
while (*xp1 != '<' && xp1 < xpe) while (*xp1 != '<' && xp1 < xpe)
xp1++; xp1++;
/* no tag can be longer that the whole buffer */ /* no tag can be longer than the whole buffer */
part = g_malloc (xp2 - xp1); part = g_malloc (xp2 - xp1);
list = gst_tag_list_new_empty (); list = gst_tag_list_new_empty ();
@ -1477,12 +1477,15 @@ gst_tag_list_from_xmp_buffer (GstBuffer * buffer)
GST_INFO ("xmp packet parsed, %d entries", gst_tag_list_n_tags (list)); GST_INFO ("xmp packet parsed, %d entries", gst_tag_list_n_tags (list));
out:
/* free resources */ /* free resources */
i = 0; i = 0;
while (ns_map[i].original_ns) { while (ns_map[i].original_ns) {
g_free (ns_map[i].gstreamer_ns); g_free (ns_map[i].gstreamer_ns);
i++; i++;
} }
g_free (part); g_free (part);
gst_buffer_unmap (buffer, &info); gst_buffer_unmap (buffer, &info);
@ -1492,13 +1495,15 @@ gst_tag_list_from_xmp_buffer (GstBuffer * buffer)
/* Errors */ /* Errors */
missing_header: missing_header:
GST_WARNING ("malformed xmp packet header"); GST_WARNING ("malformed xmp packet header");
return NULL; goto out;
missing_footer: missing_footer:
GST_WARNING ("malformed xmp packet footer"); GST_WARNING ("malformed xmp packet footer");
return NULL; goto out;
broken_xml: broken_xml:
GST_WARNING ("malformed xml tag: %s", part); GST_WARNING ("malformed xml tag: %s", part);
return NULL; gst_tag_list_unref (list);
list = NULL;
goto out;
} }