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

ges-xml-formatter: Plug some leaks

Browse source 
* Don't leak the mainloop
* Don't leak temporary strings
* Don't leak id when searching in hash table

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3597>
This commit is contained in:
Edward Hervey 2022-11-16 16:19:05 +01:00 committed by GStreamer Marge Bot
parent cc1a2bd836
commit df414c2105
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-editing-services/ges/ges-xml-formatter.c
View file

@ -1228,6 +1228,7 @@ _save_subproject (GESXmlFormatter * self, GString * str, GESProject * project,
g_signal_handlers_disconnect_by_func (subproject, project_loaded_cb, &data); g_signal_handlers_disconnect_by_func (subproject, project_loaded_cb, &data);
g_signal_handlers_disconnect_by_func (subproject, error_loading_asset_cb, g_signal_handlers_disconnect_by_func (subproject, error_loading_asset_cb,
&data); &data);
g_main_loop_unref (data.ml);
if (data.error) { if (data.error) {
g_propagate_error (error, data.error); g_propagate_error (error, data.error);
return FALSE; return FALSE;
@ -1244,6 +1245,8 @@ _save_subproject (GESXmlFormatter * self, GString * str, GESProject * project,
g_type_name (ges_asset_get_extractable_type (subproject)), properties, g_type_name (ges_asset_get_extractable_type (subproject)), properties,
metas), depth); metas), depth);
self->priv->min_version = MAX (self->priv->min_version, 6); self->priv->min_version = MAX (self->priv->min_version, 6);
g_free (properties);
g_free (metas);
depth += 4; depth += 4;
GST_DEBUG_OBJECT (self, "Saving subproject %s (depth: %d)", GST_DEBUG_OBJECT (self, "Saving subproject %s (depth: %d)",
@ -1711,10 +1714,13 @@ _save_layers (GESXmlFormatter * self, GString * str, GESTimeline * timeline,
extractable_id = ges_extractable_get_id (GES_EXTRACTABLE (clip)); extractable_id = ges_extractable_get_id (GES_EXTRACTABLE (clip));
if (GES_IS_URI_CLIP (clip)) { if (GES_IS_URI_CLIP (clip)) {
G_LOCK (uri_subprojects_map_lock); G_LOCK (uri_subprojects_map_lock);
if (g_hash_table_contains (priv->subprojects_map, extractable_id)) if (g_hash_table_contains (priv->subprojects_map, extractable_id)) {
extractable_id = gchar *new_extractable_id =
g_strdup (g_hash_table_lookup (priv->subprojects_map, g_strdup (g_hash_table_lookup (priv->subprojects_map,
extractable_id)); extractable_id));
g_free (extractable_id);
extractable_id = new_extractable_id;
}
G_UNLOCK (uri_subprojects_map_lock); G_UNLOCK (uri_subprojects_map_lock);
} }
metas = ges_meta_container_metas_to_string (GES_META_CONTAINER (clip)); metas = ges_meta_container_metas_to_string (GES_META_CONTAINER (clip));