fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Audit concat() in libutil

Browse Source 
Be more pedantic about the error-checking, fread can also return
values > 0 even though there has been a read-error.
We want to write the last incoming data and then bail.
This commit is contained in:
FRIGN
2015-03-18 22:58:42 +01:00
parent a68c2a9e6e
commit b3e8b17235
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libutil/concat.c
View File

@@ -10,12 +10,13 @@ concat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
char buf[BUFSIZ]; char buf[BUFSIZ];
size_t n; size_t n;
while ((n = fread(buf, 1, sizeof(buf), fp1)) > 0) { while ((n = fread(buf, 1, sizeof(buf), fp1))) {
if (fwrite(buf, 1, n, fp2) != n) fwrite(buf, 1, n, fp2);
eprintf("%s: write error:", s2); if (ferror(fp2))
if (feof(fp1)) eprintf("fwrite %s:", s2);
if (feof(fp1) || ferror(fp1))
break; break;
} }
if (ferror(fp1)) if (ferror(fp1))
eprintf("%s: read error:", s1); eprintf("fread %s", s1);
} }