ext/ogg/gstoggdemux.c: If we find a new serial number but it does not contain a BOS...

Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_bisect_forward_serialno),
(gst_ogg_demux_read_chain):
If we find a new serial number but it does not contain a BOS page, make
sure we initialize the chain to NULL because else we will try to scan it
and crash. Fixes #500763

diff --git a/ChangeLog b/ChangeLog
index bb82b6a2c0f8ab20739d504478e6c102b3aa467a..3641593366560b7bb0a092e8b7341a35a323cece 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-03  Wim Taymans  <wim.taymans@gmail.com>
+
+       * ext/ogg/gstoggdemux.c: (gst_ogg_demux_bisect_forward_serialno),
+       (gst_ogg_demux_read_chain):
+       If we find a new serial number but it does not contain a BOS page, make
+       sure we initialize the chain to NULL because else we will try to scan it
+       and crash. Fixes #500763
+
 2007-11-30  Wim Taymans  <wim.taymans@gmail.com>
 
        * gst/playback/Makefile.am:

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 5a6ca2b0348ca4a58a9860555e3dde7eaa2cfa50..0cba0a5823d3b2c02341c3a5ebc2ab3629307fdc 100644 (file)
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2295,6 +2295,8 @@ gst_ogg_demux_bisect_forward_serialno (GstOggDemux * ogg,
     if (ret != GST_FLOW_OK)
       goto done;
   }
+  GST_LOG_OBJECT (ogg, "adding chain %p", chain);
+
   g_array_insert_val (ogg->chains, 0, chain);
 
 done:
@@ -2363,6 +2365,8 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg, GstOggChain ** res_chain)
     if (chain) {
       gst_ogg_chain_free (chain);
     }
+    if (res_chain)
+      *res_chain = NULL;
     return ret;
   }