706b78f37f
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.
[Cherry picked from DTC commit a1ee6f068e1c8dbc62873645037a353d7852d5cc]
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>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||
|---|---|---|
| .. | ||
| libfdt | ||
| .gitignore | ||
| Makefile | ||
| Makefile.dtc | ||
| checks.c | ||
| data.c | ||
| dtc-lexer.l | ||
| dtc-lexer.lex.c_shipped | ||
| dtc-parser.tab.c_shipped | ||
| dtc-parser.tab.h_shipped | ||
| dtc-parser.y | ||
| dtc.c | ||
| dtc.h | ||
| fdtdump.c | ||
| fdtget.c | ||
| fdtput.c | ||
| flattree.c | ||
| fstree.c | ||
| livetree.c | ||
| srcpos.c | ||
| srcpos.h | ||
| treesource.c | ||
| util.c | ||
| util.h | ||
| version_gen.h | ||