[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu3-36-g3f9d596

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.karmic branch:
commit 15789b14b6111cd763cad2fa6d215484850dd101
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 23:40:56 2009 +0200

    backport ffv1 fix

diff --git a/debian/patches/security/ffv1/0001-Fix-a-possibly-exploitable-buffer-overflow.patch b/debian/patches/security/ffv1/0001-Fix-a-possibly-exploitable-buffer-overflow.patch
new file mode 100644
index 0000000..3ca0ef4
--- /dev/null
+++ b/debian/patches/security/ffv1/0001-Fix-a-possibly-exploitable-buffer-overflow.patch
@@ -0,0 +1,29 @@
+From 97e433db7abb9095e2af61ef05ffeda2699588e4 Mon Sep 17 00:00:00 2001
+From: michael <michael at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
+Date: Tue, 21 Apr 2009 12:00:39 +0000
+Subject: [PATCH] Fix a possibly exploitable buffer overflow.
+
+git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18640 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
+---
+ libavcodec/ffv1.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
+index 86f2897..9eef531 100644
+--- a/libavcodec/ffv1.c
++++ b/libavcodec/ffv1.c
+@@ -249,10 +249,9 @@ static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
+     else{
+         int i, e, a;
+         e= 0;
+-        while(get_rac(c, state+1 + e)){ //1..10
++        while(get_rac(c, state+1 + e) && e<9){ //1..10
+             e++;
+         }
+-        assert(e<=9);
+ 
+         a= 1;
+         for(i=e-1; i>=0; i--){
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 897c0d1..0c67a73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,3 +54,6 @@ security/oggparsevorbis/0001-Fix-possible-buffer-over-read-in-vorbis_comment-fix
 # libavcodec vp3 fixes
 security/vp3/0003-Make-sure-that-all-memory-allocations-succeed.patch
 security/vp3/0001-Fix-init_get_bits-buffer-size.patch
+
+# ffv1 fix
+security/ffv1/0001-Fix-a-possibly-exploitable-buffer-overflow.patch

-- 
FFmpeg packaging