6502/acme
1
0
Fork 0
mirror of https://github.com/uffejakobsen/acme.git synced 2024-12-24 16:29:23 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: unterminated strings could cause crashes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@174 4df02467-bbd4-4a76-a152-e7ce94205b78
This commit is contained in:
marcobaye 2020-05-19 09:41:54 +00:00
parent 2fbbc0324e
commit 3448cda3df
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/alu.c
View File

@ -382,8 +382,10 @@ static void parse_quoted_character(char closing_quote)
// FIXME - this will fail with backslash escaping! // FIXME - this will fail with backslash escaping!
// read character to parse - make sure not at end of statement // read character to parse - make sure not at end of statement
if (GetQuotedByte() == CHAR_EOS) if (GetQuotedByte() == CHAR_EOS) {
alu_state = STATE_ERROR;
return; return;
}
// on empty string, complain // on empty string, complain
if (GotByte == closing_quote) { if (GotByte == closing_quote) {
@ -1699,11 +1701,15 @@ static void try_to_reduce_stacks(struct expression *expression)
#define ARG_NOW (arg_stack[arg_sp - 1]) #define ARG_NOW (arg_stack[arg_sp - 1])
switch (previous_op->group) { switch (previous_op->group) {
case OPGROUP_MONADIC: // monadic operators case OPGROUP_MONADIC: // monadic operators
if (arg_sp < 1)
Bug_found("ArgStackEmpty", arg_sp); // FIXME - add to docs!
ARG_NOW.type->handle_monadic_operator(&ARG_NOW, previous_op); ARG_NOW.type->handle_monadic_operator(&ARG_NOW, previous_op);
// operation was something other than parentheses // operation was something other than parentheses
expression->is_parenthesized = FALSE; expression->is_parenthesized = FALSE;
break; break;
case OPGROUP_DYADIC: // dyadic operators case OPGROUP_DYADIC: // dyadic operators
if (arg_sp < 2)
Bug_found("NotEnoughArgs", arg_sp); // FIXME - add to docs!
ARG_PREV.type->handle_dyadic_operator(&ARG_PREV, previous_op, &ARG_NOW); ARG_PREV.type->handle_dyadic_operator(&ARG_PREV, previous_op, &ARG_NOW);
// decrement argument stack pointer because dyadic operator merged two arguments into one // decrement argument stack pointer because dyadic operator merged two arguments into one
--arg_sp; --arg_sp;