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


git-svn-id: svn://busybox.net/trunk/busybox@9324 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 4 insertions, 4 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index ddc5cea9c..29f4ecd4f 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