emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bc: fix interactive handling of comments in strings and quotes in comments

Browse Source 
function                                             old     new   delta
zbc_lex_next                                        1965    1979     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-25 23:45:57 +01:00
parent c192b0442b
commit 94576d2b97
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
miscutils/bc.c
View File

@ -2910,25 +2910,29 @@ static bool bc_lex_more_input(void)
string = G.input_buffer.v + prevlen;
while (*string) {
char c = *string;
if (string == G.input_buffer.v || string[-1] != '\\') {
if (IS_BC)
str ^= (c == '"');
else {
if (c == ']')
str -= 1;
else if (c == '[')
str += 1;
if (!comment) {
if (string == G.input_buffer.v || string[-1] != '\\') {
if (IS_BC)
str ^= (c == '"');
else {
if (c == ']')
str -= 1;
else if (c == '[')
str += 1;
}
}
}
string++;
if (c == '/' && *string == '*') {
comment = true;
string++;
continue;
}
if (c == '*' && *string == '/') {
comment = false;
string++;
if (!str) {
if (c == '/' && *string == '*') {
comment = true;
string++;
continue;
}
if (c == '*' && *string == '/') {
comment = false;
string++;
}
}
}
if (str != 0 || comment) {

16
testsuite/bc.tests
View File

@ -6,16 +6,28 @@
# testing "test name" "command" "expected result" "file input" "stdin"
testing "bc comment 1" \
testing "bc comment" \
"bc" \
"3\n" \
"" "1 /* comment */ + 2"
testing "bc comment 2: /*/ is not a closed comment" \
testing "bc /*/ is not a closed comment" \
"bc" \
"4\n" \
"" "1 /*/ + 2 */ + 3"
# this needs interactive testing
testing "bc comment with \"" \
"bc" \
"3\n" \
"" "1 /* \" */ + 2"
# this needs interactive testing
testing "bc \"string/*\" is not a comment" \
"bc" \
"string/*9\n" \
"" "\"string/*\";9"
testing "bc comment 3: unterminated #comment" \
"bc" \
"" \