From 31c27a9c6559b46c5e20fd64eaa8019daaba5e5c Mon Sep 17 00:00:00 2001
From: Eric Andersen
Date: Fri, 8 Oct 2004 08:10:57 +0000
Subject: Hiroshi Ito writes:

    Hello

    I'm using busy box on mipsel machine.

    "grep -f file" will cause segmentation fault.

Vladimir N. Oleynik writes:

Hiroshi,

Thank for bug report, but your patch is full broken.
Worked patch attached.
(really changes is zero initialize, and indent correcting).


--w
vodz
---
 findutils/grep.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'findutils')

diff --git a/findutils/grep.c b/findutils/grep.c
index ddc5cea..29f4ecd 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -249,9 +249,9 @@ static void load_regexes_from_file(llist_t *fopt)
 		fopt = cur->link;
 		free(cur);
 		f = bb_xfopen(ffile, "r");
-	while ((line = bb_get_chomped_line_from_file(f)) != NULL) {
-		pattern_head = llist_add_to(pattern_head, line);
-	}
+		while ((line = bb_get_chomped_line_from_file(f)) != NULL) {
+			pattern_head = llist_add_to(pattern_head, line);
+		}
 	}
 }
 
@@ -261,7 +261,7 @@ extern int grep_main(int argc, char **argv)
 	FILE *file;
 	int matched;
 	unsigned long opt;
-	llist_t *fopt;
+	llist_t *fopt = NULL;
 
 	/* do normal option parsing */
 #ifdef CONFIG_FEATURE_GREP_CONTEXT
-- 
cgit v1.1