From 1f43f87023abccc558840b4a87f155c1b0dc353e Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 15 Sep 2009 15:23:49 -0700 Subject: [PATCH] vorbistag: don't ever return NULL in list of strings. --- gst-libs/gst/tag/gstvorbistag.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c index 5e1668fb8..0201fce94 100644 --- a/gst-libs/gst/tag/gstvorbistag.c +++ b/gst-libs/gst/tag/gstvorbistag.c @@ -566,6 +566,7 @@ gst_tag_to_vorbis_comments (const GstTagList * list, const gchar * tag) g_free (val); } else { GST_WARNING ("Not a valid extended comment string: %s", str); + continue; } } else { result = g_strdup_printf ("%s=%s", vorbis_tag, str); @@ -587,14 +588,15 @@ gst_tag_to_vorbis_comments (const GstTagList * list, const gchar * tag) if (tag_type == GST_TYPE_DATE) { GDate *date; - if (gst_tag_list_get_date_index (list, tag, i, &date)) { - /* vorbis suggests using ISO date formats */ - result = - g_strdup_printf ("%s=%04d-%02d-%02d", vorbis_tag, - (gint) g_date_get_year (date), (gint) g_date_get_month (date), - (gint) g_date_get_day (date)); - g_date_free (date); - } + if (!gst_tag_list_get_date_index (list, tag, i, &date)) + g_return_val_if_reached (NULL); + + /* vorbis suggests using ISO date formats */ + result = + g_strdup_printf ("%s=%04d-%02d-%02d", vorbis_tag, + (gint) g_date_get_year (date), (gint) g_date_get_month (date), + (gint) g_date_get_day (date)); + g_date_free (date); } else { GST_DEBUG ("Couldn't write tag %s", tag); continue; -- 2.34.1