0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for end-of-tokens before calling the next parse_expression...

Browse source 
...in formulas. Fixes the crash described in bug #13148
This commit is contained in:
Tomasz Śniatowski 2009-03-11 23:53:47 +01:00
parent 300eaaeca9
commit 31a0ee21fb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/formula.cpp
View file

@ -767,7 +767,9 @@ expression_ptr parse_expression(const token* i1, const token* i2, function_symbo
throw formula_error("Could not parse expression", tokens_to_string(i1, i2), *i1->filename, i1->line_number);
}
if (op + 1 == end) {
throw formula_error("Expected another token", tokens_to_string(begin,end-1), *op->filename, op->line_number);
}
if(op == i1) {
try{
return expression_ptr(new unary_operator_expression(
@ -923,7 +925,6 @@ formula::formula(const std::string& str, function_symbol_table* symbols) :
expr_ = expression_ptr(new null_expression());
}
}
formula::formula(const token* i1, const token* i2, function_symbol_table* symbols) :
expr_(),
str_()