zip-reader: Fix memory leak on error path in zip_reader_create().

[pspp] / src / libpspp / zip-reader.c

diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c
index 92a67649fdae6b44f9025c42d2153207256fcd4b..0f8c26332868f83699e460474e6c635ec5288d04 100644 (file)
--- a/src/libpspp/zip-reader.c
+++ b/src/libpspp/zip-reader.c
@@ -354,14 +354,19 @@ zip_reader_create (const char *filename, struct string *errs)
       return NULL;
     }
 
-  if (! get_u16 (zr->fr, &disknum)) return NULL;
-  if (! get_u16 (zr->fr, &disknum)) return NULL;
+  if (! get_u16 (zr->fr, &disknum)
+      || ! get_u16 (zr->fr, &disknum)
 
-  if (! get_u16 (zr->fr, &zr->n_members)) return NULL;
-  if (! get_u16 (zr->fr, &total_members)) return NULL;
+      || ! get_u16 (zr->fr, &zr->n_members)
+      || ! get_u16 (zr->fr, &total_members)
 
-  if (! get_u32 (zr->fr, &central_dir_length)) return NULL;
-  if (! get_u32 (zr->fr, &central_dir_start)) return NULL;
+      || ! get_u32 (zr->fr, &central_dir_length)
+      || ! get_u32 (zr->fr, &central_dir_start))
+    {
+      fclose (zr->fr);
+      free (zr);
+      return NULL;
+    }
 
   if ( 0 != fseeko (zr->fr, central_dir_start, SEEK_SET))
     {