zawz/lxsh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix segfaults and infinite loops on some parsing errors

Browse source
This commit is contained in:
zawz 2021-06-22 09:48:02 +02:00
parent 052b2b92cb
commit 5d8ea952a2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/parse.cpp
View file

@ -1414,6 +1414,10 @@ std::pair<if_block*, parse_context> parse_if(parse_context ctx)
newctx.has_errored=true; newctx.has_errored=true;
} }
ctx = newctx; ctx = newctx;
if(ctx.i >= ctx.size)
{
return std::make_pair(ret, ctx);
}
if(word == "fi") if(word == "fi")
break; break;
@ -1597,6 +1601,7 @@ std::pair<block*, parse_context> parse_block(parse_context ctx)
else if(is_in_vector(word, out_reserved_words)) // is a reserved word else if(is_in_vector(word, out_reserved_words)) // is a reserved word
{ {
parse_error( strf("Unexpected '%s'", word.c_str())+expecting(ctx.expecting) , ctx); parse_error( strf("Unexpected '%s'", word.c_str())+expecting(ctx.expecting) , ctx);
ctx.i+=word.size();
} }
// end reserved words // end reserved words
else if( word == "function" ) // bash style function else if( word == "function" ) // bash style function
@ -1651,7 +1656,7 @@ std::pair<block*, parse_context> parse_block(parse_context ctx)
} }
if(ret->type != block::block_cmd) if(ret!=nullptr && ret->type != block::block_cmd)
{ {
uint32_t j=skip_chars(ctx, SPACES); uint32_t j=skip_chars(ctx, SPACES);
ctx.i=j; ctx.i=j;