mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ttmlparse: Fix potential resource leak identified by coverity.

Browse source 
If multiple styles/regions with the same ID are present in the input
(which is not allowed in TTML), use the last and give a warning.

Fixes CID #1405134.
This commit is contained in:
Chris Bass 2017-04-20 10:24:30 +01:00 committed by Sebastian Dröge
parent 9e3b63e109
commit 6eb36406f0
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ext/ttml/ttmlparse.c
View file

@ -1306,8 +1306,9 @@ ttml_filter_content_nodes (GNode * node)
} }
/* Store child elements of @node with name @element_name in @table, as long as /* Store in @table child elements of @node with name @element_name. A child
* @table doesn't already contain an element with the same ID. */ * element with the same ID as an existing entry in @table will overwrite the
* existing entry. */
static void static void
ttml_store_unique_children (xmlNodePtr node, const gchar * element_name, ttml_store_unique_children (xmlNodePtr node, const gchar * element_name,
GHashTable * table) GHashTable * table)
@ -1317,11 +1318,15 @@ ttml_store_unique_children (xmlNodePtr node, const gchar * element_name,
for (ptr = node->children; ptr; ptr = ptr->next) { for (ptr = node->children; ptr; ptr = ptr->next) {
if (xmlStrcmp (ptr->name, (const xmlChar *) element_name) == 0) { if (xmlStrcmp (ptr->name, (const xmlChar *) element_name) == 0) {
TtmlElement *element = ttml_parse_element (ptr); TtmlElement *element = ttml_parse_element (ptr);
gboolean new_key;
if (element) if (element) {
if (!g_hash_table_contains (table, element->id)) new_key = g_hash_table_insert (table, g_strdup (element->id), element);
g_hash_table_insert (table, (gpointer) (element->id), if (!new_key)
(gpointer) element); GST_CAT_WARNING (ttmlparse_debug,
"Document contains two %s elements with the same ID (\"%s\").",
element_name, element->id);
}
} }
} }
} }
@ -1762,9 +1767,9 @@ ttml_parse (const gchar * input, GstClockTime begin, GstClockTime duration)
} }
GST_CAT_LOG (ttmlparse_debug, "Input:\n%s", input); GST_CAT_LOG (ttmlparse_debug, "Input:\n%s", input);
styles_table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, styles_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify) ttml_delete_element); (GDestroyNotify) ttml_delete_element);
regions_table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, regions_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify) ttml_delete_element); (GDestroyNotify) ttml_delete_element);
/* Parse input. */ /* Parse input. */