X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fods-reader.c;h=2f058b044d8ac8892115ff53b498a96e7f8c78bf;hb=d4988f76544bdb8c94d6e73756b4317d09c1dc07;hp=64ae8a6142e910935051fda76b70f636ce4c9c36;hpb=df2866a475d36298a14cc1e97c6118e088ac85da;p=pspp

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 64ae8a6142..2f058b044d 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012, 2013, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -170,12 +170,12 @@ ods_unref (struct spreadsheet *s)
 	{
 	  xmlFree (r->sheets[i].name);
 	}
-	
+
+      dict_destroy (r->dict);
+
       zip_reader_destroy (r->zreader);
       free (r->sheets);
-
       free (s->file_name);
-	
       free (r);
     }
 }
@@ -921,8 +921,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
   free (var_spec);
 
-  dict_destroy (r->spreadsheet.dict);
-  r->spreadsheet.dict = NULL;
   ods_file_casereader_destroy (NULL, r);
 
   return NULL;