summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-08-17 21:19:24 +0100
committerChris Wright <chrisw@osdl.org>2005-08-29 09:55:12 -0700
commit6e5ca4f13185dea47ef4c151d32e9e387e7bb47b (patch)
tree515cd345a5003c128bfb2a3dc30714cbef351004
parent4b45a6364a096cc4d899c9d19aad852865eb0ebb (diff)
downloadlinux-stable-6e5ca4f13185dea47ef4c151d32e9e387e7bb47b.tar.gz
linux-stable-6e5ca4f13185dea47ef4c151d32e9e387e7bb47b.tar.bz2
linux-stable-6e5ca4f13185dea47ef4c151d32e9e387e7bb47b.zip
[PATCH] 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> Cc: Sergey Vlasov <vsu@altlinux.ru> Cc: Tavis Ormandy <taviso@gentoo.org> Cc: Tim Yamin <plasmaroo@gentoo.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Chris Wright <chrisw@osdl.org>
-rw-r--r--lib/zlib_inflate/inftrees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index c5f66fbb0dd0..874950ec4858 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;
}