diff options
| author | Ben Gardner <gardner.ben@gmail.com> | 2015-11-19 11:43:05 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-11-21 03:41:53 +0100 |
| commit | b50d8fbb6e769df782d5bc3c156cb82d3f646e86 (patch) | |
| tree | ca34bdef82b95811765a79d4dfde2447ab903542 | |
| parent | 2d3d1b7eee52bca47ab08730be99336c021d0f7c (diff) | |
| download | coreboot-b50d8fbb6e769df782d5bc3c156cb82d3f646e86.tar.xz | |
hexdump: Fix output if length is not a multiple of 16
hexdump currently rounds up length to a multiple of 16.
So, hexdump(ptr, 12) prints 16 hex digits, including 4 garbage bytes.
That isn't desirable and is easy to fix.
Change-Id: I86415fa9bc6cdc84b111e5e1968e39f570f294d9
Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
Reviewed-on: http://review.coreboot.org/12486
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
| -rw-r--r-- | src/lib/hexdump.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c index 6b09379d26..7907a381b5 100644 --- a/src/lib/hexdump.c +++ b/src/lib/hexdump.c @@ -30,21 +30,28 @@ void hexdump(const void *memory, size_t length) for (i = 0; i < length; i += 16) { int j; + int left = MIN(length - i, 16); - all_zero++; - for (j = 0; j < 16; j++) { - if (m[i + j] != 0) { - all_zero = 0; - break; + if (left < 16) { + all_zero = 0; + } else { + all_zero++; + for (j = 0; j < 16; j++) { + if (m[i + j] != 0) { + all_zero = 0; + break; + } } } if (all_zero < 2) { printk(BIOS_DEBUG, "%p:", memory + i); - for (j = 0; j < 16; j++) + for (j = 0; j < left; j++) printk(BIOS_DEBUG, " %02x", m[i + j]); + for (j = left; j < 16; j++) + printk(BIOS_DEBUG, " "); printk(BIOS_DEBUG, " "); - for (j = 0; j < 16; j++) + for (j = 0; j < left; j++) printk(BIOS_DEBUG, "%c", isprint(m[i + j]) ? m[i + j] : '.'); printk(BIOS_DEBUG, "\n"); |