summaryrefslogtreecommitdiffstats
path: root/usr.bin/grep
diff options
context:
space:
mode:
authorkevans <kevans@FreeBSD.org>2017-08-16 00:42:51 +0000
committerkevans <kevans@FreeBSD.org>2017-08-16 00:42:51 +0000
commit9de2da25a00017488b8375c242339df6727c8d97 (patch)
tree54b6d5ab7ef4c18aa79330a4adbe526fc9a0d4e4 /usr.bin/grep
parent01a10a26f2dc76258dda2a0d9195de329cfb5b6f (diff)
downloadFreeBSD-src-9de2da25a00017488b8375c242339df6727c8d97.zip
FreeBSD-src-9de2da25a00017488b8375c242339df6727c8d97.tar.gz
MFC r316542: bsdgrep: Handle special case of single-byte NUL pattern
PR: 202022 Approved by: emaste (mentor, blanket MFC)
Diffstat (limited to 'usr.bin/grep')
-rw-r--r--usr.bin/grep/grep.c6
1 files changed, 5 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud