summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/boot/zlib.c
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2005-07-25 23:16:13 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-05 16:23:21 -0700
commit4aad724d3e52238e1ce005f166fbba5b4072a7f6 (patch)
treec313006c1e59a41914a96c0c0b5b2b557736a0a9 /arch/ppc64/boot/zlib.c
parent00a5dfdb93f74e4d95fb0d83c890728e331f8810 (diff)
downloadop-kernel-dev-4aad724d3e52238e1ce005f166fbba5b4072a7f6.zip
op-kernel-dev-4aad724d3e52238e1ce005f166fbba5b4072a7f6.tar.gz
[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/ppc64/boot/zlib.c')
-rw-r--r--arch/ppc64/boot/zlib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c
index 9d5e4e9..78837e8 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 */
OpenPOWER on IntegriCloud