From f1107b4a873f6c2dcfcaf0135efc72badb46bc77 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Fri, 21 Dec 2012 13:04:04 +0100 Subject: hexdump: do not segfault when iterating over an empty format string Signed-off-by: Ondrej Oprala --- text-utils/parse.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'text-utils/parse.c') diff --git a/text-utils/parse.c b/text-utils/parse.c index 5f1e2bda7..bd9696108 100644 --- a/text-utils/parse.c +++ b/text-utils/parse.c @@ -421,13 +421,15 @@ isint2: switch(fu->bcnt) { !(fu->flags&F_SETREP) && fu->bcnt) fu->reps += (blocksize - fs->bcnt) / fu->bcnt; if (fu->reps > 1) { - for (pr = fu->nextpr;; pr = pr->nextpr) - if (!pr->nextpr) - break; - for (p1 = pr->fmt, p2 = NULL; *p1; ++p1) - p2 = isspace((unsigned char)*p1) ? p1 : NULL; - if (p2) - pr->nospace = p2; + if (fu->nextpr) { + for (pr = fu->nextpr; ; pr = pr->nextpr) + if (!pr->nextpr) + break; + for (p1 = pr->fmt, p2 = NULL; *p1; ++p1) + p2 = isspace((unsigned char)*p1) ? p1 : NULL; + if (p2) + pr->nospace = p2; + } } } } -- cgit v1.2.3-55-g7522