The previous checkin breaks signtool on Linux, AIX, and OSF1. Backing it

out.
sailfishos-mirror · Mar 15, 2002 · 586d1e0 · 586d1e0
1 parent 08a7a99
commit 586d1e0
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/security/nss/cmd/zlib/infblock.c b/security/nss/cmd/zlib/infblock.c
@@ -250,12 +250,10 @@ int r;
                              &s->sub.trees.tb, 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;
@@ -320,13 +318,11 @@ int r;
 #endif
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td, 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
         }
@@ -343,7 +339,6 @@ int r;
         s->sub.decode.tl = tl;
         s->sub.decode.td = td;
       }
-      ZFREE(z, s->sub.trees.blens);
       s->mode = CODES;
     case CODES:
       UPDATE