[gst-cvs] gst-plugins-good: ebml: crude hack to avoid crashing on unexpected metadata

[<sl...@ke...>]

Module: gst-plugins-good
Branch: master
Commit: c659c92091e5ae10baaf3e66f5caf7ddc6d34f0d
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=c659c92091e5ae10baaf3e66f5caf7ddc6d34f0d

Author: Philip Jägenstedt <ph...@op...>
Date:   Thu May 13 10:23:10 2010 +0200

ebml: crude hack to avoid crashing on unexpected metadata

The comment says this cannot happen, but it did and I don't know
why. This is not the correct fix, needs investigation. Test case:
bug_s555010094_r0.0005:0.008____IA__g_assertion_message_expr.webm

---

 gst/matroska/matroska-demux.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 0e1bbf7..0dfd941 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -3349,8 +3349,10 @@ gst_matroska_demux_parse_metadata (GstMatroskaDemux * demux)
   GList *l;
   GstEbmlLevel *curlevel;
 
-  /* Can't be NULL at this point */
-  g_assert (ebml->level != NULL);
+  if (ebml->level == NULL) {
+    GST_ERROR_OBJECT (demux, "Unexpected metadata, bailing");
+    return GST_FLOW_ERROR;
+  }
   curlevel = ebml->level->data;
 
   /* Make sure we don't parse a tags element twice and