ext/ogg/gstoggdemux.c: make sure to handle the case where there's no current chain...

Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_get_pad_by_pad),
(gst_ogg_demux_src_query):
make sure to handle the case where there's no current chain
gracefully.

diff --git a/ChangeLog b/ChangeLog
index 007d83185a68c4412e63b8d16e684111921ce03e..d14597927508579c8ca24ed0ce491a6f45d21fc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-06  Benjamin Otte  <otte@gnome.org>
+
+       * ext/ogg/gstoggdemux.c: (gst_ogg_get_pad_by_pad),
+       (gst_ogg_demux_src_query):
+         make sure to handle the case where there's no current chain
+         gracefully.
+
 2004-03-05  David Schleef  <ds@schleef.org>
 
        * ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 4bf88157c3e3d0c3a53fcb80c831aee9e5af7079..576854b1bf1b40ed1256aa7fd44b5dc78ec62020 100644 (file)
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -272,6 +272,10 @@ gst_ogg_get_pad_by_pad (GstOggDemux *ogg, GstPad *pad)
   GSList *walk;
   GstOggPad *cur;
   
+  if (ogg->current_chain == -1) {
+    GST_DEBUG_OBJECT (ogg, "no active chain, returning NULL");
+    return NULL;
+  }
   for (walk = CURRENT_CHAIN (ogg)->pads; walk; walk = g_slist_next (walk)) {
     cur = (GstOggPad *) walk->data;
     if (cur->pad == pad)
@@ -288,6 +292,9 @@ gst_ogg_demux_src_query (GstPad *pad, GstQueryType type,
   GstOggDemux *ogg = GST_OGG_DEMUX (gst_pad_get_parent (pad));
   GstOggPad *cur = gst_ogg_get_pad_by_pad (ogg, pad);
 
+  if (!cur)
+    return FALSE;
+
   switch (type) {
     case GST_QUERY_TOTAL: {
       if (*format == GST_FORMAT_DEFAULT) {