From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 17 Aug 2005 20:07:28 +0000 (-0700)
Subject: Revert unnecessary zlib_inflate/inftrees.c fix
X-Git-Tag: v2.6.13-rc7~65
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c231c7db30faf93419fc22d680f74d816bea70e2;p=linux-2.6-omap-h63xx.git

Revert unnecessary zlib_inflate/inftrees.c fix

It turns out that empty distance code tables are not an error, and that
a compressed block with only literals can validly have an empty table
and should not be flagged as a data error.

Some old versions of gzip had problems with this case, but it does not
affect the zlib code in the kernel.

Analysis and explanations thanks to Sergey Vlasov <vsu@altlinux.ru>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index c5f66fbb0dd..874950ec485 100644
--- a/lib/zlib_inflate/inftrees.c
+++ b/lib/zlib_inflate/inftrees.c
@@ -141,7 +141,7 @@ static int huft_build(
   {
     *t = NULL;
     *m = 0;
-    return Z_DATA_ERROR;
+    return Z_OK;
   }