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 7c1e342aa76e51bb513afa1e72cf01d9bf41e7d0..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)