[gst-cvs] gst-plugins-good: avidemux: verify size of INFO LIST to satisfy subsequent expectations

[Mark Nauwelaerts]

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

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Tue Aug  4 11:32:27 2009 +0200

avidemux: verify size of INFO LIST to satisfy subsequent expectations

---

 gst/avi/gstavidemux.c |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 3bbdbdf..c52ff79 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -3019,13 +3019,19 @@ gst_avi_demux_stream_header_push (GstAviDemux * avi)
             case GST_RIFF_LIST_INFO:
               GST_DEBUG ("Found INFO chunk");
               if (gst_avi_demux_peek_chunk (avi, &tag, &size)) {
+                GST_DEBUG ("got size %d", size);
                 avi->offset += 12;
                 gst_adapter_flush (avi->adapter, 12);
-                buf = gst_adapter_take_buffer (avi->adapter, size - 4);
-                gst_riff_parse_info (GST_ELEMENT (avi), buf, &avi->globaltags);
-                gst_buffer_unref (buf);
-
-                avi->offset += ((size + 1) & ~1) - 4;
+                if (size > 4) {
+                  buf = gst_adapter_take_buffer (avi->adapter, size - 4);
+                  gst_riff_parse_info (GST_ELEMENT (avi), buf,
+                      &avi->globaltags);
+                  gst_buffer_unref (buf);
+
+                  avi->offset += ((size + 1) & ~1) - 4;
+                } else {
+                  GST_DEBUG ("skipping INFO LIST prefix");
+                }
               } else {
                 /* Need more data */
                 return GST_FLOW_OK;
@@ -3319,6 +3325,12 @@ gst_avi_demux_stream_header_pull (GstAviDemux * avi)
               goto pull_range_failed;
             }
             GST_DEBUG ("got size %u", GST_BUFFER_SIZE (buf));
+            if (size < 4) {
+              GST_DEBUG ("skipping INFO LIST prefix");
+              avi->offset += (4 - GST_ROUND_UP_2 (size));
+              gst_buffer_unref (buf);
+              continue;
+            }
 
             sub = gst_buffer_create_sub (buf, 4, GST_BUFFER_SIZE (buf) - 4);
             gst_riff_parse_info (element, sub, &avi->globaltags);