From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Fri, 7 Jan 2011 02:06:51 +0000 (+0000)
Subject: matroska: don't put essential function calls into g_assert()
X-Git-Tag: 1.19.3~509^2~7916^2~127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68fa8f341750bc6b84ff72816d9ea8af8b6ddc42;p=platform%2Fupstream%2Fgstreamer.git

matroska: don't put essential function calls into g_assert()

g_assert() will expand to NOOPs if -DG_DISABLE_ASSERT is passed.
---

diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 379c882..24780e7 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -262,7 +262,8 @@ gst_ebml_read_master (GstEbmlRead * ebml, guint32 * id)
     return ret;
 
   /* we just at least peeked the id */
-  g_assert (gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix));
+  if (!gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix))
+    return GST_FLOW_ERROR;      /* FIXME: do proper error handling */
 
   m.offset = gst_ebml_read_get_pos (ebml);
   if (!gst_byte_reader_get_data (gst_ebml_read_br (ebml), length, &data))
@@ -329,7 +330,8 @@ gst_ebml_read_buffer (GstEbmlRead * ebml, guint32 * id, GstBuffer ** buf)
     return ret;
 
   /* we just at least peeked the id */
-  g_assert (gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix));
+  if (!gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix))
+    return GST_FLOW_ERROR;      /* FIXME: do proper error handling */
 
   if (G_LIKELY (length > 0)) {
     guint offset;
@@ -367,7 +369,8 @@ gst_ebml_read_bytes (GstEbmlRead * ebml, guint32 * id, const guint8 ** data,
     return ret;
 
   /* we just at least peeked the id */
-  g_assert (gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix));
+  if (!gst_byte_reader_skip (gst_ebml_read_br (ebml), prefix))
+    return GST_FLOW_ERROR;      /* FIXME: do proper error handling */
 
   *data = NULL;
   if (G_LIKELY (length >= 0)) {