len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash on nul character in string escape sequence

Browse source 
If a dts file contains a string with \ followed by a nul byte - an actual
nul in the input file, not the \\0 escape - then the assert() in
get_escape_char() will trip, crashing dtc.

As far as I can tell, there isn't any valid need for this assert(), so just
remove it.

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2016-01-03 23:01:24 +11:00
parent 1ab2205a6f
commit d728ad59f5
3 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
tests/nul-in-escape.dts Normal file
View file

Binary file not shown.

1
tests/run_tests.sh
View file

@ -292,6 +292,7 @@ libfdt_tests () {
run_wrap_error_test $DTC division-by-zero.dts run_wrap_error_test $DTC division-by-zero.dts
run_wrap_error_test $DTC bad-octal-literal.dts run_wrap_error_test $DTC bad-octal-literal.dts
run_dtc_test -I dts -O dtb nul-in-escape.dts
} }
dtc_tests () { dtc_tests () {

1
util.c
View file

@ -152,7 +152,6 @@ char get_escape_char(const char *s, int *i)
int j = *i + 1; int j = *i + 1;
char val; char val;
assert(c);
switch (c) { switch (c) {
case 'a': case 'a':
val = '\a'; val = '\a';