diff options
Diffstat (limited to 'text-utils/hexdump-display.c')
| -rw-r--r-- | text-utils/hexdump-display.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/text-utils/hexdump-display.c b/text-utils/hexdump-display.c index bc92bd0..c865127 100644 --- a/text-utils/hexdump-display.c +++ b/text-utils/hexdump-display.c @@ -250,6 +250,8 @@ void display(struct hexdump *hex) struct list_head *p, *q, *r; while ((bp = get(hex)) != NULL) { + ssize_t rem = hex->blocksize; + fs = &hex->fshead; savebp = bp; saveaddress = address; list_for_each(p, fs) { @@ -263,7 +265,7 @@ void display(struct hexdump *hex) cnt = fu->reps; - while (cnt) { + while (cnt && rem >= 0) { list_for_each(r, &fu->prlist) { pr = list_entry(r, struct hexdump_pr, prlist); @@ -280,12 +282,18 @@ void display(struct hexdump *hex) print(pr, bp); address += pr->bcnt; + + rem -= pr->bcnt; + if (rem < 0) + break; + bp += pr->bcnt; } --cnt; } } bp = savebp; + rem = hex->blocksize; address = saveaddress; } } |