From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Feb 2012 14:34:08 +0000 (+0100)
Subject: hexdump: make code more robust
X-Git-Tag: v2.21-rc2~13
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=bafd2d4653ebb9e49853ba8688d46fc8b3748df5;p=thirdparty%2Futil-linux.git

hexdump: make code more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/parse.c b/text-utils/parse.c
index e41b4a0c74..481db6d3ee 100644
--- a/text-utils/parse.c
+++ b/text-utils/parse.c
@@ -80,7 +80,7 @@ void addfile(char *name)
 void add(const char *fmt)
 {
 	const char *p;
-	static FS **nextfs;
+	static FS **nextfs = NULL;
 	FS *tfs;
 	FU *tfu, **nextfu;
 	const char *savep;
@@ -89,8 +89,9 @@ void add(const char *fmt)
 	tfs = xcalloc(1, sizeof(FS));
 	if (!fshead)
 		fshead = tfs;
-	else
+	else if (nextfs)
 		*nextfs = tfs;
+
 	nextfs = &tfs->nextfs;
 	nextfu = &tfs->nextfu;
 
@@ -222,7 +223,7 @@ void rewrite(FS *fs)
 			pr = xcalloc(1, sizeof(PR));
 			if (!fu->nextpr)
 				fu->nextpr = pr;
-			else
+			else if (nextpr)
 				*nextpr = pr;
 
 			/* Skip preceding text and up to the next % sign. */