Browse Source

fdtdump: Fix bug printing bytestrings with negative values

On systems where 'char' is signed, fdtdump will currently print the wrong
thing on properties containing bytestring values with "negative" bytes
(that is with values from 0x80..0xff).  The fdtdump testcase is extended
to cover this case too.

This corrects the problem by forcing use of unsigned char - although this
is perhaps another indication that fdtdump is a buggy hack and if you want
to do real work you should use dtc -O dts.

Reported-by: Igor Prusov <Igor.V.Prusov@mcst.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
David Gibson 10 years ago
parent
commit
e5e6df7c37
  1. 1
      tests/fdtdump.dts
  2. 2
      util.c

1
tests/fdtdump.dts

@ -23,6 +23,7 @@
randomnode { randomnode {
string = "foo", "stuff"; string = "foo", "stuff";
bytes = [61 62 63 64 65]; bytes = [61 62 63 64 65];
nbytes = [80 ff];
child { child {
}; };
}; };

2
util.c

@ -349,7 +349,6 @@ int utilfdt_decode_type(const char *fmt, int *type, int *size)
void utilfdt_print_data(const char *data, int len) void utilfdt_print_data(const char *data, int len)
{ {
int i; int i;
const char *p = data;
const char *s; const char *s;


/* no data, don't print */ /* no data, don't print */
@ -376,6 +375,7 @@ void utilfdt_print_data(const char *data, int len)
i < (len - 1) ? " " : ""); i < (len - 1) ? " " : "");
printf(">"); printf(">");
} else { } else {
const unsigned char *p = (const unsigned char *)data;
printf(" = ["); printf(" = [");
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
printf("%02x%s", *p++, i < len - 1 ? " " : ""); printf("%02x%s", *p++, i < len - 1 ? " " : "");

Loading…
Cancel
Save