File CVE-2018-16548.patch of Package zziplib

Overview Repositories Revisions Requests Users Attributes Meta

File CVE-2018-16548.patch of Package zziplib (Revision b75ea50c7c5dbd4021a9c6e7cf969533)

Currently displaying revision b75ea50c7c5dbd4021a9c6e7cf969533 , Show latest

Index: zziplib-0.13.67/zzip/zip.c
===================================================================
--- zziplib-0.13.67.orig/zzip/zip.c
+++ zziplib-0.13.67/zzip/zip.c
@@ -470,9 +470,15 @@ __zzip_parse_root_directory(int fd,
         else
         {
             if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0)
+	    {
+	        free(hdr0);
                 return ZZIP_DIR_SEEK;
+	    }
             if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent))
+	    {
+	        free(hdr0);
                 return ZZIP_DIR_READ;
+	    }
             d = &dirent;
         }
 
@@ -572,11 +578,21 @@ __zzip_parse_root_directory(int fd,
 
         if (hdr_return)
             *hdr_return = hdr0;
+	else
+	{
+	    /* If it is not assigned to *hdr_return, it will never be free()'d */
+	    free(hdr0);
+	}
     }                           /* else zero (sane) entries */
+    else
+    {
+	/* If it is not assigned to *hdr_return, it will never be free()'d */
+        free(hdr0);
+    }
 #  ifndef ZZIP_ALLOW_MODULO_ENTRIES
-    return (entries != zz_entries ? ZZIP_CORRUPTED : 0);
+    return (entries != zz_entries) ? ZZIP_CORRUPTED : 0;
 #  else
-    return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0);
+    return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0;
 #  endif
 }

Places

File CVE-2018-16548.patch of Package zziplib (Revision b75ea50c7c5dbd4021a9c6e7cf969533)

Places