X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fgnumeric-reader.c;h=cc8d335b3cff0dcf9bb8c571d0a1f3e8eb8e508c;hb=43a916e8e177a54a6d6a8565aa92a4239f3383bb;hp=c36a6832537a086ddd0123ad509210c213ef9b2f;hpb=c13375ebe886fc3ed5ce70a260bb2b01cebb4b1f;p=pspp-builds.git

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index c36a6832..cc8d335b 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -53,8 +53,6 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 #include <data/case.h>
 #include <data/value.h>
 
-#include <gl/mbswidth.h>
-
 #include "gnumeric-reader.h"
 #include <data/identifier.h>
 #include <assert.h>
@@ -553,7 +551,7 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 	      xmlChar *attr =
 		xmlTextReaderGetAttribute (r->xtr, _xml ("ValueType"));
 
-	      if ( 60 !=  _xmlchar_to_int (attr))
+	      if ( NULL == attr || 60 !=  _xmlchar_to_int (attr))
 		var_spec [idx].width = 0;
 
 	      free (attr);
@@ -635,6 +633,7 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
     }
 
   free (var_spec);
+  dict_destroy (*dict);
 
   gnm_file_casereader_destroy (NULL, r);