ensonic gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst-libs/gst/riff/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     ensonic
Date:           Tue Dec 09 2008  17:21:52 UTC

Log message:
	* gst-libs/gst/riff/riff-read.c:
	  Fix handling of odd chunks in riff metadata.

Modified files:
    .               : ChangeLog
    gst-libs/gst/riff: riff-read.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4235&r2=1.4236
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-read.c.diff?r1=1.54&r2=1.55

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4235
retrieving revision 1.4236
diff -u -d -r1.4235 -r1.4236
--- ChangeLog	8 Dec 2008 18:44:20 -0000	1.4235
+++ ChangeLog	9 Dec 2008 17:21:35 -0000	1.4236
@@ -1,3 +1,8 @@
+2008-12-09  Stefan Kost  <[email protected]>
+
+	* gst-libs/gst/riff/riff-read.c:
+	  Fix handling of odd chunks in riff metadata.
 2008-12-08  Wim Taymans  <[email protected]>
 
 	* gst/volume/gstvolume.c: (gst_volume_class_init),
Index: riff-read.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-read.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- riff-read.c	1 Aug 2008 11:55:07 -0000	1.54
+++ riff-read.c	9 Dec 2008 17:21:37 -0000	1.55
@@ -614,6 +614,10 @@
     tsize = GST_READ_UINT32_LE (data + 4);
     size -= 8;
     data += 8;
+    GST_DEBUG ("tag %" GST_FOURCC_FORMAT ", size %u",
+        GST_FOURCC_ARGS (tag), tsize);
     if (tsize > size) {
       GST_WARNING_OBJECT (element,
           "Tagsize %d is larger than available data %d", tsize, size);
@@ -715,6 +719,9 @@
       }
     }
+    if (tsize & 1)
+      tsize++;
     data += tsize;
     size -= tsize;
   }

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/