r247 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-23 21:45:50 +0000 (Fri, 23 Mar 2007)
New Revision: 247

Added:
   unstable/ffmpeg/debian/patches/053_rm_demux_crash.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
Log:
  * debian/patches/053_rm_demux_crash.diff:
    + New patch: don't crash with corrupted rm files (Closes: #379922).


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-03-23 17:29:38 UTC (rev 246)
+++ unstable/ffmpeg/debian/changelog	2007-03-23 21:45:50 UTC (rev 247)
@@ -1,13 +1,16 @@
 ffmpeg (0.cvs20060823-8) unstable; urgency=high
 
-  * 052_base64_encode_crash.diff:
+  * debian/patches/052_base64_encode_crash.diff:
     + New patch: fix a crash in base64 encoding.
 
+  * debian/patches/053_rm_demux_crash.diff:
+    + New patch: don't crash with corrupted rm files (Closes: #379922).
+
   * debian/control:
     + Set pkg-multimedia-maintainers as main maintainer.
     + Updated VCS fields.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 23 Mar 2007 18:28:17 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 23 Mar 2007 22:43:48 +0100
 
 ffmpeg (0.cvs20060823-7) unstable; urgency=high
 

Added: unstable/ffmpeg/debian/patches/053_rm_demux_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/053_rm_demux_crash.diff	2007-03-23 17:29:38 UTC (rev 246)
+++ unstable/ffmpeg/debian/patches/053_rm_demux_crash.diff	2007-03-23 21:45:50 UTC (rev 247)
@@ -0,0 +1,25 @@
+Index: ffmpeg-0.cvs20060823/libavformat/rm.c
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libavformat/rm.c	2007-03-23 22:42:34.000000000 +0100
++++ ffmpeg-0.cvs20060823/libavformat/rm.c	2007-03-23 22:43:28.000000000 +0100
+@@ -959,9 +959,8 @@
+                 len=len2;
+             rm->remaining_len-= len;
+             av_get_packet(pb, pkt, len);
+-        }
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
++        } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
+             if ((st->codec->codec_id == CODEC_ID_RA_288) ||
+                 (st->codec->codec_id == CODEC_ID_COOK)) {
+                 int x;
+@@ -1013,7 +1012,8 @@
+                 }
+             } else
+                 av_get_packet(pb, pkt, len);
+-        }
++
++        } else goto resync;
+ 
+         if(  (st->discard >= AVDISCARD_NONKEY && !(flags&2))
+            || st->discard >= AVDISCARD_ALL){

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2007-03-23 17:29:38 UTC (rev 246)
+++ unstable/ffmpeg/debian/patches/series	2007-03-23 21:45:50 UTC (rev 247)
@@ -17,4 +17,5 @@
 050_h264-misc-security-fixes.diff
 051_asf-misc-security-fixes.diff
 052_base64_encode_crash.diff
+053_rm_demux_crash.diff
 060_fix_avi_skip.diff