projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buffer overflow which could occur if the matrix reader encounters a badly formed...
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index afb742ffeae06de29b57ba327bd85a41a753aaeb..07621a84b81e6877e8ad5bd2e71f673cbebf18da 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-181,13
+181,9
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
else
break;
}
else
break;
}
- if (lex_token (lexer) != T_SLASH)
- {
- lex_force_match (lexer, T_SLASH);
- goto done;
- }
- lex_get (lexer);
+ if (!lex_force_match (lexer, T_SLASH))
+ goto done;
expr = expr_parse_any (lexer, ds, optimize);
if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)
expr = expr_parse_any (lexer, ds, optimize);
if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)