diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-09-03 19:26:31 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-09-03 19:26:31 +0000 |
| commit | 673881bbe1e216f7c6885fd664982300f5c6d82e (patch) | |
| tree | bae2eb4bee8a31d4f37cd9131ea3631990e6bfff /media-gfx/gimp/files | |
| parent | Fix l10n collision with the non-recompiled-yet libreoffice. (diff) | |
| download | historical-673881bbe1e216f7c6885fd664982300f5c6d82e.tar.gz historical-673881bbe1e216f7c6885fd664982300f5c6d82e.tar.bz2 historical-673881bbe1e216f7c6885fd664982300f5c6d82e.zip | |
media-gfx/gimp: Integrate patch for security issue CVE-2011-2896 (bug #379289)
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/gimp/files')
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch b/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch new file mode 100644 index 000000000000..735d771750d6 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.6.11-cve-2011-2896.patch @@ -0,0 +1,61 @@ +From 376ad788c1a1c31d40f18494889c383f6909ebfc Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Thu, 04 Aug 2011 10:51:42 +0000 +Subject: file-gif-load: fix heap corruption and buffer overflow (CVE-2011-2896) + +--- +(limited to 'plug-ins/common/file-gif-load.c') + +diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c +index 81f3bd0..c91e7aa 100644 +--- a/plug-ins/common/file-gif-load.c ++++ b/plug-ins/common/file-gif-load.c +@@ -713,7 +713,8 @@ LZWReadByte (FILE *fd, + static gint firstcode, oldcode; + static gint clear_code, end_code; + static gint table[2][(1 << MAX_LZW_BITS)]; +- static gint stack[(1 << (MAX_LZW_BITS)) * 2], *sp; ++#define STACK_SIZE ((1 << (MAX_LZW_BITS)) * 2) ++ static gint stack[STACK_SIZE], *sp; + gint i; + + if (just_reset_LZW) +@@ -788,7 +789,7 @@ LZWReadByte (FILE *fd, + + return firstcode & 255; + } +- else if (code == end_code) ++ else if (code == end_code || code > max_code) + { + gint count; + guchar buf[260]; +@@ -807,13 +808,14 @@ LZWReadByte (FILE *fd, + + incode = code; + +- if (code >= max_code) ++ if (code == max_code) + { +- *sp++ = firstcode; ++ if (sp < &(stack[STACK_SIZE])) ++ *sp++ = firstcode; + code = oldcode; + } + +- while (code >= clear_code) ++ while (code >= clear_code && sp < &(stack[STACK_SIZE])) + { + *sp++ = table[1][code]; + if (code == table[0][code]) +@@ -824,7 +826,8 @@ LZWReadByte (FILE *fd, + code = table[0][code]; + } + +- *sp++ = firstcode = table[1][code]; ++ if (sp < &(stack[STACK_SIZE])) ++ *sp++ = firstcode = table[1][code]; + + if ((code = max_code) < (1 << MAX_LZW_BITS)) + { +-- +cgit v0.9.0.2 |