diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-05-31 12:33:04 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@jdl.com> | 2013-06-03 08:28:58 -0500 |
commit | a1ee6f068e1c8dbc62873645037a353d7852d5cc (patch) | |
tree | 50f77874ae68ca8f957321966fbfc85b8487cb65 | |
parent | 2e3fc7e9b3a4722a5500afaa9faf7874c61b2e6a (diff) | |
download | dtc-a1ee6f068e1c8dbc62873645037a353d7852d5cc.tar.gz |
dtc: ensure #line directives don't consume data from the next line
Previously, the #line parsing regex ended with ({WS}+[0-9]+)?. The {WS}
could match line-break characters. If the #line directive did not contain
the optional flags field at the end, this could cause any integer data on
the next line to be consumed as part of the #line directive parsing. This
could cause syntax errors (i.e. #line parsing consuming the leading 0
from a hex literal 0x1234, leaving x1234 to be parsed as cell data,
which is a syntax error), or invalid compilation results (i.e. simply
consuming literal 1234 as part of the #line processing, thus removing it
from the cell data).
Fix this by replacing {WS} with [ \t] so that it can't match line-breaks.
Convert all instances of {WS}, even though the other instances should be
irrelevant for any well-formed #line directive. This is done for
consistency and ultimate safety.
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r-- | dtc-lexer.l | 2 | ||||
-rw-r--r-- | tests/line_directives.dts | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/dtc-lexer.l b/dtc-lexer.l index 254d5af..3b41bfc 100644 --- a/dtc-lexer.l +++ b/dtc-lexer.l @@ -71,7 +71,7 @@ static int pop_input_file(void); push_input_file(name); } -<*>^"#"(line)?{WS}+[0-9]+{WS}+{STRING}({WS}+[0-9]+)? { +<*>^"#"(line)?[ \t]+[0-9]+[ \t]+{STRING}([ \t]+[0-9]+)? { char *line, *tmp, *fn; /* skip text before line # */ line = yytext; diff --git a/tests/line_directives.dts b/tests/line_directives.dts index e9d0800..046ef37 100644 --- a/tests/line_directives.dts +++ b/tests/line_directives.dts @@ -8,4 +8,14 @@ # 6 "bar.dts" / { +/* + * Make sure optional flags don't consume integer data on next line. The issue + * was that the {WS} in the trailing ({WS}+[0-9]+)? could cross the * line- + * break, and consume the leading "0" of the hex constant, leaving "x12345678" + * to be parsed as a number, which is invalid syntax. + */ + prop1 = < +# 10 "qux.dts" + 0x12345678 + >; }; |