[coreboot-gerrit] New patch to review for coreboot: hexdump: Fix output if length is not a multiple of 16
Ben Gardner (gardner.ben@gmail.com)
gerrit at coreboot.org
Thu Nov 19 18:50:36 CET 2015
Ben Gardner (gardner.ben at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12486
-gerrit
commit 21a2bcb8f5a2b08481306b32b56b20b05de095e9
Author: Ben Gardner <gardner.ben at gmail.com>
Date: Thu Nov 19 11:43:05 2015 -0600
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 at gmail.com>
---
src/lib/hexdump.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c
index 6b09379..7907a38 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");
More information about the coreboot-gerrit
mailing list