gst/qtmux/gstqtmux.c: Add some more safety/sanity checks in tag manipulation.

Original commit message from CVS:
* gst/qtmux/gstqtmux.c: (gst_qt_mux_add_metadata_tags):
Add some more safety/sanity checks in tag manipulation.

diff --git a/ChangeLog b/ChangeLog
index a6c74c5..975cf62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
+
+       * gst/qtmux/gstqtmux.c: (gst_qt_mux_add_metadata_tags):
+       Add some more safety/sanity checks in tag manipulation.
+
 2008-11-10  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst/rtpmanager/gstrtpjitterbuffer.c:

diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index 9a181aa..7eaf730 100644 (file)
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -360,9 +360,9 @@ gst_qt_mux_add_metadata_tags (GstQTMux * qtmux, const GstTagList * list)
         /* strings */
       case G_TYPE_STRING:
       {
-        gchar *str;
+        gchar *str = NULL;
 
-        if (!gst_tag_list_get_string (list, tag, &str))
+        if (!gst_tag_list_get_string (list, tag, &str) || !str)
           break;
         GST_DEBUG_OBJECT (qtmux, "Adding tag %" GST_FOURCC_FORMAT " -> %s",
             GST_FOURCC_ARGS (fourcc), str);
@@ -400,13 +400,13 @@ gst_qt_mux_add_metadata_tags (GstQTMux * qtmux, const GstTagList * list)
       default:
       {
         if (gst_tag_get_type (tag) == GST_TYPE_DATE) {
-          GDate *date;
+          GDate *date = NULL;
           GDateYear year;
           GDateMonth month;
           GDateDay day;
           gchar *str;
 
-          if (!gst_tag_list_get_date (list, tag, &date))
+          if (!gst_tag_list_get_date (list, tag, &date) || !date)
             break;
           year = g_date_get_year (date);
           month = g_date_get_month (date);