]> git.sesse.net Git - vlc/commitdiff
SDL_image: fixed patch submitted in [24741], so it does merge correctly
authorFelix Paul Kühne <fkuehne@videolan.org>
Fri, 1 Feb 2008 11:02:25 +0000 (11:02 +0000)
committerFelix Paul Kühne <fkuehne@videolan.org>
Fri, 1 Feb 2008 11:02:25 +0000 (11:02 +0000)
extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch

index de827724dddb2e137011cbf71ffc2c35666db28a..40134ff8dec31256e53df456882194d699c44e92 100644 (file)
@@ -1,15 +1,13 @@
-Common subdirectories: sdl-image1.2-1.2.5/debian and sdl-image1.2-1.2.5-fixed/debian
-diff -up sdl-image1.2-1.2.5/IMG_gif.c sdl-image1.2-1.2.5-fixed/IMG_gif.c
---- sdl-image1.2-1.2.5/IMG_gif.c       2008-01-30 19:49:29.000000000 -0500
-+++ sdl-image1.2-1.2.5-fixed/IMG_gif.c 2008-01-30 19:52:56.000000000 -0500
-@@ -418,6 +418,10 @@ LWZReadByte(SDL_RWops *src, int flag, in
+--- SDL_image/IMG_gif.orig.c   2008-02-01 11:58:19.000000000 +0100
++++ SDL_image/IMG_gif.c        2008-02-01 11:58:28.000000000 +0100
+@@ -415,6 +415,10 @@
+     static int table[2][(1 << MAX_LWZ_BITS)];
      static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
      register int i;
++    
 +    /* Fixed buffer overflow found by Michael Skladnikiewicz */
-+    if (input_code_size > MAX_LWZ_BITS)
++    if( input_code_size > MAX_LWZ_BITS )
 +        return -1;
-+
      if (flag) {
        set_code_size = input_code_size;
-       code_size = set_code_size + 1;