mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: consistently handle file open failures

Browse source 
In part based on

Coverity CID 45129

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-30 09:32:12 -08:00
parent bc6ec7cccb
commit 1e20bc9c73
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
core/uemis-downloader.c
View file

@ -479,7 +479,7 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
int timeout = UEMIS_LONG_TIMEOUT; int timeout = UEMIS_LONG_TIMEOUT;
reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666); reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666);
if (reqtxt_file == -1) { if (reqtxt_file < 0) {
*error_text = "can't open req.txt"; *error_text = "can't open req.txt";
#ifdef UEMIS_DEBUG #ifdef UEMIS_DEBUG
fprintf(debugfile, "open %s failed with errno %d\n", reqtxt_path, errno); fprintf(debugfile, "open %s failed with errno %d\n", reqtxt_path, errno);
@ -529,6 +529,13 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
snprintf(fl, 13, "ANS%d.TXT", filenr - 1); snprintf(fl, 13, "ANS%d.TXT", filenr - 1);
ans_path = build_filename(build_filename(path, "ANS"), fl); ans_path = build_filename(build_filename(path, "ANS"), fl);
ans_file = subsurface_open(ans_path, O_RDONLY, 0666); ans_file = subsurface_open(ans_path, O_RDONLY, 0666);
if (ans_file < 0) {
*error_text = "can't open Uemis response file";
#ifdef UEMIS_DEBUG
fprintf(debugfile, "open %s failed with errno %d\n", ans_path, errno);
#endif
return false;
}
read(ans_file, tmp, 100); read(ans_file, tmp, 100);
close(ans_file); close(ans_file);
#if UEMIS_DEBUG & 8 #if UEMIS_DEBUG & 8
@ -558,7 +565,7 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
assembling_mbuf = false; assembling_mbuf = false;
} }
reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666); reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666);
if (reqtxt_file == -1) { if (reqtxt_file < 0) {
*error_text = "can't open req.txt"; *error_text = "can't open req.txt";
fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno); fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno);
return false; return false;
@ -573,7 +580,7 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
searching = false; searching = false;
} }
reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666); reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666);
if (reqtxt_file == -1) { if (reqtxt_file < 0) {
*error_text = "can't open req.txt"; *error_text = "can't open req.txt";
fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno); fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno);
return false; return false;
@ -588,6 +595,13 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
ans_path = build_filename(intermediate, fl); ans_path = build_filename(intermediate, fl);
free(intermediate); free(intermediate);
ans_file = subsurface_open(ans_path, O_RDONLY, 0666); ans_file = subsurface_open(ans_path, O_RDONLY, 0666);
if (ans_file < 0) {
*error_text = "can't open Uemis response file";
#ifdef UEMIS_DEBUG
fprintf(debugfile, "open %s failed with errno %d\n", ans_path, errno);
#endif
return false;
}
free(ans_path); free(ans_path);
size = bytes_available(ans_file); size = bytes_available(ans_file);
if (size > 3) { if (size > 3) {
@ -621,6 +635,14 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
ans_path = build_filename(intermediate, fl); ans_path = build_filename(intermediate, fl);
free(intermediate); free(intermediate);
ans_file = subsurface_open(ans_path, O_RDONLY, 0666); ans_file = subsurface_open(ans_path, O_RDONLY, 0666);
if (ans_file < 0) {
*error_text = "can't open Uemis response file";
#ifdef UEMIS_DEBUG
fprintf(debugfile, "open %s failed with errno %d\n", ans_path, errno);
#endif
return false;
}
free(ans_path); free(ans_path);
size = bytes_available(ans_file); size = bytes_available(ans_file);
if (size > 3) { if (size > 3) {