r246 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-23 17:29:38 +0000 (Fri, 23 Mar 2007)
New Revision: 246

Added:
   unstable/ffmpeg/debian/patches/052_base64_encode_crash.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
Log:
  * 052_base64_encode_crash.diff:
    + New patch: fix a crash in base64 encoding.


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-03-22 20:43:40 UTC (rev 245)
+++ unstable/ffmpeg/debian/changelog	2007-03-23 17:29:38 UTC (rev 246)
@@ -1,10 +1,13 @@
-ffmpeg (0.cvs20060823-8) UNRELEASED; urgency=low
+ffmpeg (0.cvs20060823-8) unstable; urgency=high
 
+  * 052_base64_encode_crash.diff:
+    + New patch: fix a crash in base64 encoding.
+
   * debian/control:
     + Set pkg-multimedia-maintainers as main maintainer.
     + Updated VCS fields.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 14 Mar 2007 19:38:14 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 23 Mar 2007 18:28:17 +0100
 
 ffmpeg (0.cvs20060823-7) unstable; urgency=high
 

Added: unstable/ffmpeg/debian/patches/052_base64_encode_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/052_base64_encode_crash.diff	2007-03-22 20:43:40 UTC (rev 245)
+++ unstable/ffmpeg/debian/patches/052_base64_encode_crash.diff	2007-03-23 17:29:38 UTC (rev 246)
@@ -0,0 +1,13 @@
+Index: ffmpeg-0.cvs20060823/libavformat/http.c
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libavformat/http.c	2007-03-23 18:27:03.000000000 +0100
++++ ffmpeg-0.cvs20060823/libavformat/http.c	2007-03-23 18:27:11.000000000 +0100
+@@ -297,7 +297,7 @@
+     unsigned int len= strlen(src);
+     char *ret, *dst;
+     unsigned i_bits = 0;
+-    unsigned i_shift = 0;
++    int i_shift = 0;
+ 
+     if(len < UINT_MAX/4){
+         ret=dst= av_malloc( len * 4 / 3 + 12 );

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2007-03-22 20:43:40 UTC (rev 245)
+++ unstable/ffmpeg/debian/patches/series	2007-03-23 17:29:38 UTC (rev 246)
@@ -16,4 +16,5 @@
 040_only_use_maltivec_when_needed.diff
 050_h264-misc-security-fixes.diff
 051_asf-misc-security-fixes.diff
+052_base64_encode_crash.diff
 060_fix_avi_skip.diff