From b50d8fbb6e769df782d5bc3c156cb82d3f646e86 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Thu, 19 Nov 2015 11:43:05 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/12486 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Paul Menzel --- src/lib/hexdump.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/lib') 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"); -- cgit v1.2.3