diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2015-03-26 13:34:53 +0100 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-03-30 08:59:36 -0300 |
| commit | 592cab1512b52142f10f144cfdbb0abba40e924b (patch) | |
| tree | 5c8f6d26452b9578ab775f4bb1ea78f44541bc9e | |
| parent | 71b0b8d943bacecdd66fe724bc3a67b145abe215 (diff) | |
matroska: fix GValue leaks when parsing tags
gst_tag_list_add_value() doesn't consume the GValue we pass to it so there is
no point copying it.
https://bugzilla.gnome.org/show_bug.cgi?id=746810
| -rw-r--r-- | gst/matroska/matroska-read-common.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/gst/matroska/matroska-read-common.c b/gst/matroska/matroska-read-common.c index 679cefbf0..0b8e70079 100644 --- a/gst/matroska/matroska-read-common.c +++ b/gst/matroska/matroska-read-common.c @@ -2210,71 +2210,67 @@ gst_matroska_read_common_apply_target_type_foreach (const GstTagList * list, return; for (i = 0; i < vallen; i++) { - GValue val = { 0 }; const GValue *val_ref; val_ref = gst_tag_list_get_value_index (list, tag, i); if (val_ref == NULL) continue; - g_value_init (&val, G_VALUE_TYPE (val_ref)); - g_value_copy (val_ref, &val); /* TODO: use the optional ctx->target_type somehow */ if (strcmp (tag, GST_TAG_TITLE) == 0) { if (ctx->target_type_value >= 70 && !ctx->audio_only) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_SHOW_NAME, &val); + GST_TAG_SHOW_NAME, val_ref); continue; } else if (ctx->target_type_value >= 50) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM, &val); + GST_TAG_ALBUM, val_ref); continue; } } else if (strcmp (tag, GST_TAG_TITLE_SORTNAME) == 0) { if (ctx->target_type_value >= 70 && !ctx->audio_only) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_SHOW_SORTNAME, &val); + GST_TAG_SHOW_SORTNAME, val_ref); continue; } else if (ctx->target_type_value >= 50) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM_SORTNAME, &val); + GST_TAG_ALBUM_SORTNAME, val_ref); continue; } } else if (strcmp (tag, GST_TAG_ARTIST) == 0) { if (ctx->target_type_value >= 50) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM_ARTIST, &val); + GST_TAG_ALBUM_ARTIST, val_ref); continue; } } else if (strcmp (tag, GST_TAG_ARTIST_SORTNAME) == 0) { if (ctx->target_type_value >= 50) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM_ARTIST_SORTNAME, &val); + GST_TAG_ALBUM_ARTIST_SORTNAME, val_ref); continue; } } else if (strcmp (tag, GST_TAG_TRACK_COUNT) == 0) { if (ctx->target_type_value >= 60) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM_VOLUME_COUNT, &val); + GST_TAG_ALBUM_VOLUME_COUNT, val_ref); continue; } } else if (strcmp (tag, GST_TAG_TRACK_NUMBER) == 0) { if (ctx->target_type_value >= 60 && !ctx->audio_only) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_SHOW_SEASON_NUMBER, &val); + GST_TAG_SHOW_SEASON_NUMBER, val_ref); continue; } else if (ctx->target_type_value >= 50 && !ctx->audio_only) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_SHOW_EPISODE_NUMBER, &val); + GST_TAG_SHOW_EPISODE_NUMBER, val_ref); continue; } else if (ctx->target_type_value >= 50) { gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, - GST_TAG_ALBUM_VOLUME_NUMBER, &val); + GST_TAG_ALBUM_VOLUME_NUMBER, val_ref); continue; } } - gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, tag, &val); - g_value_unset (&val); + gst_tag_list_add_value (ctx->result, GST_TAG_MERGE_APPEND, tag, val_ref); } } |