From 45ff9057712f11e2737b37e040bea99bc51934e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Mon, 5 Oct 2009 11:46:08 +0100
Subject: [PATCH] qtdemux: make sure compatible brands buffer exists before
 dereferencing it

---
 gst/qtdemux/qtdemux.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 5be8a174ff..8f1ebd1af7 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4844,7 +4844,7 @@ qtdemux_is_brand_3gp (GstQTDemux * qtdemux, gboolean major)
   if (major) {
     return ((qtdemux->major_brand & GST_MAKE_FOURCC (255, 255, 0, 0)) ==
         GST_MAKE_FOURCC ('3', 'g', 0, 0));
-  } else {
+  } else if (qtdemux->comp_brands != NULL) {
     guint8 *data = GST_BUFFER_DATA (qtdemux->comp_brands);
     guint size = GST_BUFFER_SIZE (qtdemux->comp_brands);
     gboolean res = FALSE;
@@ -4856,6 +4856,8 @@ qtdemux_is_brand_3gp (GstQTDemux * qtdemux, gboolean major)
       size -= 4;
     }
     return res;
+  } else {
+    return FALSE;
   }
 }