Gracefully handle bad octal literals
The code handling integer literals in dtc-lexer.l assumes that the flex regexp means that strtoull() can't fail to interpret the string as a valid integer (either decimal, octal, or hexadecimal). This is not true for octals. For example '09' is accepted as a literal by the regexp, strtoull() attempts to handle it as octal, but it has a bad digit. This changes the code to give a more useful error in this case. Reported-by: Anton Blanchard <anton@samba.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
1937095588
commit
1ab2205a6f
3 changed files with 10 additions and 1 deletions
|
@ -153,7 +153,10 @@ static void lexical_error(const char *fmt, ...);
|
|||
errno = 0;
|
||||
yylval.integer = strtoull(yytext, &e, 0);
|
||||
|
||||
assert(!(*e) || !e[strspn(e, "UL")]);
|
||||
if (*e && e[strspn(e, "UL")]) {
|
||||
lexical_error("Bad integer literal '%s'",
|
||||
yytext);
|
||||
}
|
||||
|
||||
if (errno == ERANGE)
|
||||
lexical_error("Integer literal '%s' out of range",
|
||||
|
|
5
tests/bad-octal-literal.dts
Normal file
5
tests/bad-octal-literal.dts
Normal file
|
@ -0,0 +1,5 @@
|
|||
/dts-v1/;
|
||||
|
||||
/ {
|
||||
x = <09>;
|
||||
};
|
|
@ -291,6 +291,7 @@ libfdt_tests () {
|
|||
run_dtc_test -I dts -O dtb bad-size-cells.dts
|
||||
|
||||
run_wrap_error_test $DTC division-by-zero.dts
|
||||
run_wrap_error_test $DTC bad-octal-literal.dts
|
||||
}
|
||||
|
||||
dtc_tests () {
|
||||
|
|
Loading…
Reference in a new issue