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
This commit is contained in:
parent
94d628c76a
commit
31c27a9c65
@ -249,9 +249,9 @@ static void load_regexes_from_file(llist_t *fopt)
|
|||||||
fopt = cur->link;
|
fopt = cur->link;
|
||||||
free(cur);
|
free(cur);
|
||||||
f = bb_xfopen(ffile, "r");
|
f = bb_xfopen(ffile, "r");
|
||||||
while ((line = bb_get_chomped_line_from_file(f)) != NULL) {
|
while ((line = bb_get_chomped_line_from_file(f)) != NULL) {
|
||||||
pattern_head = llist_add_to(pattern_head, line);
|
pattern_head = llist_add_to(pattern_head, line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -261,7 +261,7 @@ extern int grep_main(int argc, char **argv)
|
|||||||
FILE *file;
|
FILE *file;
|
||||||
int matched;
|
int matched;
|
||||||
unsigned long opt;
|
unsigned long opt;
|
||||||
llist_t *fopt;
|
llist_t *fopt = NULL;
|
||||||
|
|
||||||
/* do normal option parsing */
|
/* do normal option parsing */
|
||||||
#ifdef CONFIG_FEATURE_GREP_CONTEXT
|
#ifdef CONFIG_FEATURE_GREP_CONTEXT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user