h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 03:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for builtin_test crash

Browse Source 
https://github.com/fish-shell/fish-shell/issues/497
This commit is contained in:
ridiculousfish
2013-01-06 14:48:46 -08:00
parent 8a357e1866
commit bf3e4126b2
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin_test.cpp
View File

@@ -334,11 +334,12 @@ expression *test_parser::parse_combining_expression(unsigned int start, unsigned
std::vector<expression *> subjects;
std::vector<token_t> combiners;
unsigned int idx = start;
bool first = true;
while (idx < end)
{
if (! subjects.empty())
if (! first)
{
/* This is not the first expression, so we expect a combiner. */
token_t combiner = token_for_string(arg(idx))->tok;
@@ -357,12 +358,18 @@ expression *test_parser::parse_combining_expression(unsigned int start, unsigned
if (! expr)
{
add_error(L"Missing argument at index %u", idx);
if (! first)
{
/* Clean up the dangling combiner, since it never got its right hand expression */
combiners.pop_back();
}
break;
}
/* Go to the end of this expression */
idx = expr->range.end;
subjects.push_back(expr);
first = false;
}
if (! subjects.empty())