From 9de2da25a00017488b8375c242339df6727c8d97 Mon Sep 17 00:00:00 2001 From: kevans Date: Wed, 16 Aug 2017 00:42:51 +0000 Subject: MFC r316542: bsdgrep: Handle special case of single-byte NUL pattern PR: 202022 Approved by: emaste (mentor, blanket MFC) --- usr.bin/grep/grep.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index b85db5a..fe8c778 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -315,8 +315,12 @@ read_patterns(const char *fn) } len = 0; line = NULL; - while ((rlen = getline(&line, &len, f)) != -1) + while ((rlen = getline(&line, &len, f)) != -1) { + if (line[0] == '\0') + continue; add_pattern(line, line[0] == '\n' ? 0 : (size_t)rlen); + } + free(line); if (ferror(f)) err(2, "%s", fn); -- cgit v1.1