Merge branch 'master' into import-gui

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

diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c
index 985b0a9027723180f6362d430ad66e9b8f49c045..3f1d277c92ab140e19653e4383a116bdeb86c1d8 100644 (file)
--- a/src/libpspp/zip-reader.c
+++ b/src/libpspp/zip-reader.c
@@ -126,7 +126,9 @@ zip_reader_destroy (struct zip_reader *zr)
   if (zr == NULL) 
     return;
 
-  fclose (zr->fr);
+  if (zr->fr != NULL)
+    fclose (zr->fr);
+
   free (zr->filename);
 
   for (i = 0; i < zr->n_members; ++i)
@@ -382,7 +384,7 @@ zip_member_open (struct zip_reader *zr, const char *member)
   uint32_t ucomp_size, comp_size;
   
   uint32_t crc;
-
+  bool new_member = false;
   char *name = NULL;
 
   int i;
@@ -396,7 +398,10 @@ zip_member_open (struct zip_reader *zr, const char *member)
     zm = zr->members[i];
 
     if (zm == NULL)
-      zm = zr->members[i] = zip_header_read_next (zr);
+      {
+       zm = zr->members[i] = zip_header_read_next (zr);
+       new_member = true;
+      }
     if (zm && 0 == strcmp (zm->name, member))
       break;
     else
@@ -450,8 +455,11 @@ zip_member_open (struct zip_reader *zr, const char *member)
   free (name);
 
   zm->bytes_unread = zm->ucomp_size;
+  
+  if ( !new_member)
+    decompressors[zm->compression].finish (zm);
 
-  if ( !  decompressors[zm->compression].init (zm) )
+  if (!decompressors[zm->compression].init (zm) )
     return NULL;
 
   return zm;