X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvalue-parser.c;h=269d24bca48d04b13da5c7a054b08fcdb281d4fd;hb=3da49359c52cb783db907cc197847bbd5e721c97;hp=c2020d36581bf9263cbf366884aa2071c4643f17;hpb=4e8efdc4acb80fc1a3735228d29fca0cf86fee6d;p=pspp diff --git a/src/language/lexer/value-parser.c b/src/language/lexer/value-parser.c index c2020d3658..269d24bca4 100644 --- a/src/language/lexer/value-parser.c +++ b/src/language/lexer/value-parser.c @@ -103,9 +103,13 @@ parse_number (struct lexer *lexer, double *x, const enum fmt_type *format) else if (lex_is_string (lexer) && format != NULL) { union value v; - assert (! (fmt_get_category (*format) & ( FMT_CAT_STRING ))); - data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE, *format, 0, 0, - NULL, &v, 0); + + assert (fmt_get_category (*format) != FMT_CAT_STRING); + + if (!data_in_msg (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE, + *format, &v, 0, NULL)) + return false; + lex_get (lexer); *x = v.f; if (*x == SYSMIS)