From 131cac80e193d8a8aef49eb910f24080857c2fca Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 30 Jul 2016 04:40:44 +0000 Subject: [PATCH] Explicitly test for cu_fgets returning NULL or !NULL MFC after: 3 weeks Sponsored by: EMC / Isilon Storage Division --- usr.bin/sed/compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c index d5b0fca18b03..891fe5b8d780 100644 --- a/usr.bin/sed/compile.c +++ b/usr.bin/sed/compile.c @@ -546,7 +546,7 @@ compile_subst(const char *p, struct s_subst *s) if ((text = realloc(text, asize)) == NULL) err(1, "realloc"); } - } while ((p = cu_fgets(&more))); + } while ((p = cu_fgets(&more)) != NULL); errx(1, "%lu: %s: unterminated substitute in regular expression", linenum, fname); /* NOTREACHED */ @@ -733,7 +733,7 @@ compile_text(size_t *ptlen) if ((text = malloc(asize)) == NULL) err(1, "malloc"); size = 0; - while ((p = cu_fgets(NULL))) { + while ((p = cu_fgets(NULL)) != NULL) { op = s = text + size; for (esc_nl = 0; *p != '\0'; p++) { if (*p == '\\' && p[1] != '\0' && *++p == '\n')