Close the input FILE * in read_file() and the output FILE * in write_file()
if read_stream() or write_stream() fails to avoid leaking the FILE. Reported by: Coverity CID: 977702 Reviewed by: pfg MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D6554
This commit is contained in:
parent
360ba6bc13
commit
92a58a9246
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=300692
27
bin/ed/io.c
27
bin/ed/io.c
@ -36,20 +36,24 @@ read_file(char *fn, long n)
|
|||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
long size;
|
long size;
|
||||||
|
int cs;
|
||||||
|
|
||||||
fp = (*fn == '!') ? popen(fn + 1, "r") : fopen(strip_escapes(fn), "r");
|
fp = (*fn == '!') ? popen(fn + 1, "r") : fopen(strip_escapes(fn), "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
errmsg = "cannot open input file";
|
errmsg = "cannot open input file";
|
||||||
return ERR;
|
return ERR;
|
||||||
} else if ((size = read_stream(fp, n)) < 0)
|
}
|
||||||
return ERR;
|
if ((size = read_stream(fp, n)) < 0) {
|
||||||
else if (((*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
|
errmsg = "error reading input file";
|
||||||
|
}
|
||||||
|
if ((cs = (*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
|
||||||
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
errmsg = "cannot close input file";
|
errmsg = "cannot close input file";
|
||||||
return ERR;
|
|
||||||
}
|
}
|
||||||
|
if (size < 0 || cs < 0)
|
||||||
|
return ERR;
|
||||||
if (!scripted)
|
if (!scripted)
|
||||||
fprintf(stdout, "%lu\n", size);
|
fprintf(stdout, "%lu\n", size);
|
||||||
return current_addr - n;
|
return current_addr - n;
|
||||||
@ -143,19 +147,24 @@ write_file(char *fn, const char *mode, long n, long m)
|
|||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
long size;
|
long size;
|
||||||
|
int cs;
|
||||||
|
|
||||||
fp = (*fn == '!') ? popen(fn+1, "w") : fopen(strip_escapes(fn), mode);
|
fp = (*fn == '!') ? popen(fn+1, "w") : fopen(strip_escapes(fn), mode);
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
errmsg = "cannot open output file";
|
errmsg = "cannot open output file";
|
||||||
return ERR;
|
return ERR;
|
||||||
} else if ((size = write_stream(fp, n, m)) < 0)
|
}
|
||||||
return ERR;
|
if ((size = write_stream(fp, n, m)) < 0) {
|
||||||
else if (((*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
|
errmsg = "error writing output file";
|
||||||
|
}
|
||||||
|
if ((cs = (*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
|
||||||
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
|
||||||
errmsg = "cannot close output file";
|
errmsg = "cannot close output file";
|
||||||
return ERR;
|
|
||||||
}
|
}
|
||||||
|
if (size < 0 || cs < 0)
|
||||||
|
return ERR;
|
||||||
if (!scripted)
|
if (!scripted)
|
||||||
fprintf(stdout, "%lu\n", size);
|
fprintf(stdout, "%lu\n", size);
|
||||||
return n ? m - n + 1 : 0;
|
return n ? m - n + 1 : 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user