[src/netbsd-2]: src Pull up revision 1.10 (requested by tron in ticket #5550):

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/979fb7a943ef
branches:  netbsd-2
changeset: 563936:979fb7a943ef
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Aug 05 20:19:00 2005 +0000

description:
Pull up revision 1.10 (requested by tron in ticket #5550):
Return correct error on all zero length codes. Fix from Gentoo bug 94584.

diffstat:

 lib/libz/inftrees.c     |  6 +++---
 sys/lib/libz/inftrees.c |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r c833b48a1a3b -r 979fb7a943ef lib/libz/inftrees.c
--- a/lib/libz/inftrees.c       Thu Jul 28 20:26:35 2005 +0000
+++ b/lib/libz/inftrees.c       Fri Aug 05 20:19:00 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inftrees.c,v 1.9 2003/03/18 19:53:16 mycroft Exp $ */
+/* $NetBSD: inftrees.c,v 1.9.4.1 2005/08/05 20:19:00 snj Exp $ */
 
 /* inftrees.c -- generate Huffman trees for efficient decoding
  * Copyright (C) 1995-2002 Mark Adler
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: inftrees.c,v 1.9 2003/03/18 19:53:16 mycroft Exp $");
+__RCSID("$NetBSD: inftrees.c,v 1.9.4.1 2005/08/05 20:19:00 snj Exp $");
 
 #include "zutil.h"
 #include "inftrees.h"
@@ -147,7 +147,7 @@
   {
     *t = (inflate_huft *)Z_NULL;
     *m = 0;
-    return Z_OK;
+    return Z_NEED_DICT;
   }
 
 
diff -r c833b48a1a3b -r 979fb7a943ef sys/lib/libz/inftrees.c
--- a/sys/lib/libz/inftrees.c   Thu Jul 28 20:26:35 2005 +0000
+++ b/sys/lib/libz/inftrees.c   Fri Aug 05 20:19:00 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inftrees.c,v 1.7 2003/08/31 22:40:49 fvdl Exp $ */
+/* $NetBSD: inftrees.c,v 1.7.4.1 2005/08/05 20:19:19 snj Exp $ */
 
 /* inftrees.c -- generate Huffman trees for efficient decoding
  * Copyright (C) 1995-2002 Mark Adler
@@ -144,7 +144,7 @@
   {
     *t = (inflate_huft *)Z_NULL;
     *m = 0;
-    return Z_OK;
+    return Z_NEED_DICT;
   }