head	1.3;
access;
symbols
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE:1.3.0.20
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_SOLID:1.3.0.18
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.16
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_2_3_RELEASE:1.3
	OPENPKG_2_3_SOLID:1.3.0.14
	OPENPKG_2_3_SOLID_BP:1.3
	OPENPKG_2_2_RELEASE:1.3
	OPENPKG_2_2_SOLID:1.3.0.12
	OPENPKG_2_2_SOLID_BP:1.3
	OPENPKG_2_1_RELEASE:1.3
	OPENPKG_2_1_SOLID:1.3.0.10
	OPENPKG_2_1_SOLID_BP:1.3
	OPENPKG_2_0_RELEASE:1.3
	OPENPKG_2_0_SOLID:1.3.0.8
	OPENPKG_2_0_SOLID_BP:1.3
	OPENPKG_1_3_RELEASE:1.3
	OPENPKG_1_3_SOLID:1.3.0.6
	OPENPKG_1_3_SOLID_BP:1.3
	OPENPKG_1_2_SOLID:1.3.0.4
	OPENPKG_1_2_SOLID_BP:1.3
	OPENPKG_1_STABLE:1.3.0.2
	OPENPKG_1_STABLE_BP:1.3
	OPENPKG_1_0_SOLID:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2002.04.18.09.32.35;	author ms;	state dead;
branches;
next	1.2;

1.2
date	2002.03.12.15.30.19;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2002.03.12.15.12.52;	author rse;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2002.03.12.15.12.52;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@The zlib patch is irrelevant, because it was merged with the cvs sources in this version.
@
text
@diff -u3 zlib-1.1.3/infblock.c zlib-1.1.4/infblock.c
--- zlib-1.1.3/infblock.c	Mon Jun  8 19:06:16 1998
+++ zlib-1.1.4/infblock.c	Mon Mar 11 14:16:01 2002
@@@@ -249,10 +249,12 @@@@
                              &s->sub.trees.tb, s->hufts, z);
       if (t != Z_OK)
       {
-        ZFREE(z, s->sub.trees.blens);
         r = t;
         if (r == Z_DATA_ERROR)
+        {
+          ZFREE(z, s->sub.trees.blens);
           s->mode = BAD;
+        }
         LEAVE
       }
       s->sub.trees.index = 0;
@@@@ -313,11 +315,13 @@@@
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td,
                                   s->hufts, z);
-        ZFREE(z, s->sub.trees.blens);
         if (t != Z_OK)
         {
           if (t == (uInt)Z_DATA_ERROR)
+          {
+            ZFREE(z, s->sub.trees.blens);
             s->mode = BAD;
+          }
           r = t;
           LEAVE
         }
@@@@ -329,6 +333,7 @@@@
         }
         s->sub.decode.codes = c;
       }
+      ZFREE(z, s->sub.trees.blens);
       s->mode = CODES;
     case CODES:
       UPDATE
@


1.2
log
@fix security bug
@
text
@@


1.1
log
@file zlib.patch was initially added on branch OPENPKG_1_0_SOLID.
@
text
@d1 40
@


1.1.2.1
log
@fix zlib security bug
@
text
@a0 40
diff -u3 zlib-1.1.3/infblock.c zlib-1.1.4/infblock.c
--- zlib-1.1.3/infblock.c	Mon Jun  8 19:06:16 1998
+++ zlib-1.1.4/infblock.c	Mon Mar 11 14:16:01 2002
@@@@ -249,10 +249,12 @@@@
                              &s->sub.trees.tb, s->hufts, z);
       if (t != Z_OK)
       {
-        ZFREE(z, s->sub.trees.blens);
         r = t;
         if (r == Z_DATA_ERROR)
+        {
+          ZFREE(z, s->sub.trees.blens);
           s->mode = BAD;
+        }
         LEAVE
       }
       s->sub.trees.index = 0;
@@@@ -313,11 +315,13 @@@@
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td,
                                   s->hufts, z);
-        ZFREE(z, s->sub.trees.blens);
         if (t != Z_OK)
         {
           if (t == (uInt)Z_DATA_ERROR)
+          {
+            ZFREE(z, s->sub.trees.blens);
             s->mode = BAD;
+          }
           r = t;
           LEAVE
         }
@@@@ -329,6 +333,7 @@@@
         }
         s->sub.decode.codes = c;
       }
+      ZFREE(z, s->sub.trees.blens);
       s->mode = CODES;
     case CODES:
       UPDATE
@