projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops. Arguments reversed.
[pspp-builds.git]
/
src
/
data
/
gnumeric-reader.c
diff --git
a/src/data/gnumeric-reader.c
b/src/data/gnumeric-reader.c
index c36a6832537a086ddd0123ad509210c213ef9b2f..cc8d335b3cff0dcf9bb8c571d0a1f3e8eb8e508c 100644
(file)
--- 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 <data/case.h>
#include <data/value.h>
-#include <gl/mbswidth.h>
-
#include "gnumeric-reader.h"
#include <data/identifier.h>
#include <assert.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"));
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);
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);
}
free (var_spec);
+ dict_destroy (*dict);
gnm_file_casereader_destroy (NULL, r);
gnm_file_casereader_destroy (NULL, r);