[src/netbsd-1-5]: src/sys/netinet6 Pull up revisions 1.17-1.19 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/3ca7fda440bc
branches:  netbsd-1-5
changeset: 492976:3ca7fda440bc
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 20 23:18:38 2002 +0000

description:
Pull up revisions 1.17-1.19 (requested by fvdl):
  Upgrade libz to 1.1.4 due to a possible security bug.

diffstat:

 sys/netinet6/ipcomp_core.c |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 6376db6cc55a -r 3ca7fda440bc sys/netinet6/ipcomp_core.c
--- a/sys/netinet6/ipcomp_core.c        Wed Mar 20 23:18:36 2002 +0000
+++ b/sys/netinet6/ipcomp_core.c        Wed Mar 20 23:18:38 2002 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipcomp_core.c,v 1.9.4.1 2000/09/29 06:42:42 itojun Exp $       */
-/*     $KAME: ipcomp_core.c,v 1.22 2000/09/26 07:55:14 itojun Exp $    */
+/*     $NetBSD: ipcomp_core.c,v 1.9.4.2 2002/03/20 23:18:38 he Exp $   */
+/*     $KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $    */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -34,6 +34,9 @@
  * RFC2393 IP payload compression protocol (IPComp).
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: ipcomp_core.c,v 1.9.4.2 2002/03/20 23:18:38 he Exp $");
+
 #include "opt_inet.h"
 
 #include <sys/param.h>
@@ -211,13 +214,13 @@
                              : deflate(&zs, Z_NO_FLUSH);
 
                if (zerror == Z_STREAM_END)
-                       ; /*once more.*/
+                       ; /* once more. */
                else if (zerror == Z_OK) {
                        /* inflate: Z_OK can indicate the end of decode */
                        if (mode && !p && zs.avail_out != 0)
                                goto terminate;
                        else
-                               ; /*once more.*/
+                               ; /* once more. */
                } else {
                        if (zs.msg) {
                                ipseclog((LOG_ERR, "ipcomp_%scompress: "
@@ -246,14 +249,17 @@
                        MOREBLOCK();
                }
 
-               zerror = mode ? inflate(&zs, Z_FINISH)
+               zerror = mode ? inflate(&zs, Z_SYNC_FLUSH)
                              : deflate(&zs, Z_FINISH);
 
                if (zerror == Z_STREAM_END)
                        break;
-               else if (zerror == Z_OK)
-                       ; /*once more.*/
-               else {
+               else if (zerror == Z_OK) {
+                       if (mode && zs.avail_out != 0)
+                               goto terminate;
+                       else
+                               ; /* once more. */
+               } else {
                        if (zs.msg) {
                                ipseclog((LOG_ERR, "ipcomp_%scompress: "
                                    "%sflate(Z_FINISH): %s\n",