diff options
| author | Tim Yamin <plasmaroo@gentoo.org> | 2005-07-26 00:16:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-06 01:23:21 +0200 |
| commit | 4aad724d3e52238e1ce005f166fbba5b4072a7f6 (patch) | |
| tree | c313006c1e59a41914a96c0c0b5b2b557736a0a9 /arch | |
| parent | [PATCH] Fix semundo lock leakage (diff) | |
| download | linux-4aad724d3e52238e1ce005f166fbba5b4072a7f6.tar.xz linux-4aad724d3e52238e1ce005f166fbba5b4072a7f6.zip | |
[PATCH] Update in-kernel zlib routines
These bugs have been fixed in the standard zlib for a while.
See for example
a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html
b) http://bugs.gentoo.org/show_bug.cgi?id=94584
Signed-off-by: Tim Yamin <plasmaroo@gentoo.org>
Signed-off-by: Tavis Ormandy <taviso@gentoo.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc64/boot/zlib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c index 9d5e4e9832d2..78837e884b8b 100644 --- a/arch/ppc64/boot/zlib.c +++ b/arch/ppc64/boot/zlib.c @@ -1307,7 +1307,7 @@ local int huft_build( { *t = (inflate_huft *)Z_NULL; *m = 0; - return Z_OK; + return Z_DATA_ERROR; } @@ -1351,6 +1351,7 @@ local int huft_build( if ((j = *p++) != 0) v[x[j]++] = i; } while (++i < n); + n = x[g]; /* set n to length of v */ /* Generate the Huffman codes and for each, make the table entries */ |