d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly test for cu_fgets returning NULL or !NULL

Browse Source 
MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
ngie 2016-07-30 04:40:44 +00:00
parent b7d66285ef
commit cedf419a7b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/sed/compile.c
View File

@ -546,7 +546,7 @@ compile_subst(const char *p, struct s_subst *s)
if ((text = realloc(text, asize)) == NULL) if ((text = realloc(text, asize)) == NULL)
err(1, "realloc"); err(1, "realloc");
} }
} while ((p = cu_fgets(&more))); } while ((p = cu_fgets(&more)) != NULL);
errx(1, "%lu: %s: unterminated substitute in regular expression", errx(1, "%lu: %s: unterminated substitute in regular expression",
linenum, fname); linenum, fname);
/* NOTREACHED */ /* NOTREACHED */
@ -733,7 +733,7 @@ compile_text(size_t *ptlen)
if ((text = malloc(asize)) == NULL) if ((text = malloc(asize)) == NULL)
err(1, "malloc"); err(1, "malloc");
size = 0; size = 0;
while ((p = cu_fgets(NULL))) { while ((p = cu_fgets(NULL)) != NULL) {
op = s = text + size; op = s = text + size;
for (esc_nl = 0; *p != '\0'; p++) { for (esc_nl = 0; *p != '\0'; p++) {
if (*p == '\\' && p[1] != '\0' && *++p == '\n') if (*p == '\\' && p[1] != '\0' && *++p == '\n')