projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
variable: Make property function return untranslated versions.
[pspp]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index e34b86bc1a6af916f7179e93cdd0922971436fa2..8a58be434c71a6b61de8497bb255458fd3d3daf5 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-599,7
+599,13
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
lex_get (lexer);
}
- name = xstrdup (lex_tokcstr (lexer));
+ const char * tstr = lex_tokcstr (lexer);
+ if (tstr == NULL)
+ {
+ lex_error (lexer, NULL);
+ goto error;
+ }
+ name = xstrdup (tstr);
if (!lex_force_id (lexer)
|| !dict_id_is_valid (dict, name, true))
{
if (!lex_force_id (lexer)
|| !dict_id_is_valid (dict, name, true))
{
@@
-673,14
+679,14
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
if (reader == NULL)
goto error;
if (reader == NULL)
goto error;
- data_parser_make_active_file (parser, ds, reader, dict);
+ data_parser_make_active_file (parser, ds, reader, dict
, NULL, NULL
);
fh_unref (fh);
free (encoding);
return CMD_SUCCESS;
error:
data_parser_destroy (parser);
fh_unref (fh);
free (encoding);
return CMD_SUCCESS;
error:
data_parser_destroy (parser);
- dict_
destroy
(dict);
+ dict_
unref
(dict);
fh_unref (fh);
free (name);
free (encoding);
fh_unref (fh);
free (name);
free (encoding);