Issue #1338 - Part 2: Update NSS to 3.48-RTM

1 files changed, 26 insertions, 18 deletions

diff --git a/security/nss/lib/jar/jarfile.c b/security/nss/lib/jar/jarfile.c
index e2470a121..c1eab5251 100644
--- a/security/nss/lib/jar/jarfile.c
+++ b/security/nss/lib/jar/jarfile.c
@@ -208,13 +208,12 @@ JAR_extract(JAR *jar, char *path, char *outpath)
 
     phy = jar_get_physical(jar, path);
     if (phy) {
-        if (phy->compression != 0 && phy->compression != 8) {
-            /* unsupported compression method */
-            result = JAR_ERR_CORRUPT;
-        }
         if (phy->compression == 0) {
             result = jar_physical_extraction((PRFileDesc *)jar->fp, outpath, phy->offset, phy->length);
         } else {
+            /* compression methods other than 8 are unsupported,
+             * but for historical reasons, jar_physical_inflate will be called for
+             * unsupported compression method constants too. */
             result = jar_physical_inflate((PRFileDesc *)jar->fp, outpath,
                                           phy->offset, phy->length,
                                           (unsigned int)phy->compression);
@@ -305,19 +304,19 @@ jar_physical_inflate(JAR_FILE fp, char *outpath, unsigned long offset, unsigned
         return JAR_ERR_MEMORY;
 
     if ((outbuf = (char *)PORT_ZAlloc(OCHUNK)) == NULL) {
-        PORT_Free(inbuf);
-        return JAR_ERR_MEMORY;
+        status = JAR_ERR_MEMORY;
+        goto loser;
     }
 
     PORT_Memset(&zs, 0, sizeof(zs));
     status = inflateInit2(&zs, -MAX_WBITS);
     if (status != Z_OK) {
-        PORT_Free(inbuf);
-        PORT_Free(outbuf);
-        return JAR_ERR_GENERAL;
+        status = JAR_ERR_GENERAL;
+        goto loser;
     }
 
     if ((out = JAR_FOPEN(outpath, "wb")) != NULL) {
+        int status2 = 0;
         unsigned long at = 0;
 
         JAR_FSEEK(fp, offset, (PRSeekWhence)0);
@@ -328,9 +327,8 @@ jar_physical_inflate(JAR_FILE fp, char *outpath, unsigned long offset, unsigned
             if (JAR_FREAD(fp, inbuf, chunk) != chunk) {
                 /* incomplete read */
                 JAR_FCLOSE(out);
-                PORT_Free(inbuf);
-                PORT_Free(outbuf);
-                return JAR_ERR_CORRUPT;
+                status = JAR_ERR_CORRUPT;
+                break;
             }
             at += chunk;
             if (at == length) {
@@ -351,9 +349,8 @@ jar_physical_inflate(JAR_FILE fp, char *outpath, unsigned long offset, unsigned
                 if (status != Z_OK && status != Z_STREAM_END) {
                     /* error during decompression */
                     JAR_FCLOSE(out);
-                    PORT_Free(inbuf);
-                    PORT_Free(outbuf);
-                    return JAR_ERR_CORRUPT;
+                    status = JAR_ERR_CORRUPT;
+                    break;
                 }
                 ochunk = zs.total_out - prev_total;
                 if (JAR_FWRITE(out, outbuf, ochunk) < (long)ochunk) {
@@ -364,15 +361,26 @@ jar_physical_inflate(JAR_FILE fp, char *outpath, unsigned long offset, unsigned
                 if (status == Z_STREAM_END)
                     break;
             }
+            if (status != Z_OK) {
+                break;
+            }
         }
         JAR_FCLOSE(out);
-        status = inflateEnd(&zs);
+        status2 = inflateEnd(&zs);
+        if (status == Z_OK) {
+            status = status2;
+        }
     } else {
         /* error opening output file */
         status = JAR_ERR_DISK;
     }
-    PORT_Free(inbuf);
-    PORT_Free(outbuf);
+loser:
+    if (inbuf) {
+        PORT_Free(inbuf);
+    }
+    if (outbuf) {
+        PORT_Free(outbuf);
+    }
     return status;
 }