From: Rajeev V. Pillai <rajeevvp@gmail.com>
Date: Wed, 3 Oct 2007 20:39:27 +0000 (+0200)
Subject: pg: fix segfault on search
X-Git-Tag: v2.14-rc1~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b00dd6d5491c31434e08434844d068e2aca5f0d;p=thirdparty%2Futil-linux.git

pg: fix segfault on search

Run pg(1) and type '/<CR>' which is supposed to forward search for the
previously remembered search string. pg(1) will segfault after printing
"No remembered search string:".

Signed-off-by: Rajeev V. Pillai <rajeevvp@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index ca9335a37f..b87097a8a3 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -895,7 +895,7 @@ int main(int argc, char **argv)
 	if (fslen_ub < offset) {
 		fprintf(stderr,
 			_("not enough space allocated for ROM image "
-			  "(%Ld allocated, %d used)\n"),
+			  "(%lld allocated, %d used)\n"),
 			fslen_ub, offset);
 		exit(8);
 	}
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 3e1b25ea34..2defd9af86 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -1116,7 +1116,7 @@ pgfile(FILE *f, char *name)
 			 */
 			eof = 1;
 		}
-		if (search == FORWARD) {
+		if (search == FORWARD && remembered == 1) {
 			if (eof) {
 				line = oldline;
 				search = searchcount = 0;