10509a70e
Brian Foley
2019-09-05
Subject
dc: Parse error & fix out of bounds read in xc_program_printString
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/bc.c+4 -2
| @@ -5456,11 +5456,13 @@ static void xc_program_printString(const char *str) | |
| char *n; | |
| c = *str++; | |
| - | n = strchr(esc, c); // note: c can be NUL |
| - | if (!n) { |
| + | n = strchr(esc, c); // note: if c is NUL, n = \0 at end of esc |
| + | if (!n || !c) { |
| // Just print the backslash and following character | |
| bb_putchar('\\'); | |
| ++G.prog.nchars; | |
| + | // But if we're at the end of the string, stop |
| + | if (!c) break; |
| } else { | |
| if (n - esc == 0) // "\n" ? | |
| G.prog.nchars = SIZE_MAX; | |
testsuite/dc.tests+20 -0
| @@ -59,6 +59,26 @@ testing "dc: x should work with strings created from a" \ | |
| "42\n" \ | |
| "" "" | |
| + | testing "dc: p should print invalid escapes" \ |
| + | "dc -e '[\q] p'" \ |
| + | "\\q\n" \ |
| + | "" "" |
| + | |
| + | testing "dc: p should print trailing backslashes" \ |
| + | "dc -e '[q\] p'" \ |
| + | "q\\\\\n" \ |
| + | "" "" |
| + | |
| + | testing "dc: p should parse/print single backslashes" \ |
| + | "dc -e '[\] p'" \ |
| + | "\\\\\n" \ |
| + | "" "" |
| + | |
| + | testing "dc: p should print single backslash strings" \ |
| + | "dc -e '92 a p'" \ |
| + | "\\\\\n" \ |
| + | "" "" |
| + | |
| testing "dc read" \ | |
| "dc -finput" \ | |
| "2\n9\n1\n" \ | |