mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better error handling

Browse source 
Most of these will likely have no big impact, but it's better not to just
ignore them as they could lead to crashes.

Uemis downloader: if lseek fails, return 0
Uemis downloader: consistently check for failure to open req.txt
Zip file handling: dup could fail

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-22 06:46:01 -07:00
parent 64c7202e2d
commit 90f20f4c76
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/subsurfacewebservices.cpp
View file

@ -808,9 +808,12 @@ void DivelogsDeWebServices::downloadFinished()
zipFile.seek(0); zipFile.seek(0);
#if defined(Q_OS_UNIX) && defined(LIBZIP_VERSION_MAJOR) #if defined(Q_OS_UNIX) && defined(LIBZIP_VERSION_MAJOR)
int duppedfd = dup(zipFile.handle()); int duppedfd = dup(zipFile.handle());
struct zip *zip = zip_fdopen(duppedfd, 0, &errorcode); struct zip *zip = NULL;
if (!zip) if (duppedfd >= 0) {
::close(duppedfd); zip = zip_fdopen(duppedfd, 0, &errorcode);
if (!zip)
::close(duppedfd);
}
#else #else
struct zip *zip = zip_open(QFile::encodeName(zipFile.fileName()), 0, &errorcode); struct zip *zip = zip_open(QFile::encodeName(zipFile.fileName()), 0, &errorcode);
#endif #endif

12
uemis-downloader.c
View file

@ -148,6 +148,8 @@ static long bytes_available(int file)
{ {
long result; long result;
long now = lseek(file, 0, SEEK_CUR); long now = lseek(file, 0, SEEK_CUR);
if (now == -1)
return 0;
result = lseek(file, 0, SEEK_END); result = lseek(file, 0, SEEK_END);
lseek(file, now, SEEK_SET); lseek(file, now, SEEK_SET);
if (now == -1 || result == -1) if (now == -1 || result == -1)
@ -516,6 +518,11 @@ 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) {
*error_text = "can't open req.txt";
fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno);
return false;
}
trigger_response(reqtxt_file, "n", filenr, file_length); trigger_response(reqtxt_file, "n", filenr, file_length);
} }
} else { } else {
@ -526,6 +533,11 @@ 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) {
*error_text = "can't open req.txt";
fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno);
return false;
}
trigger_response(reqtxt_file, "r", filenr, file_length); trigger_response(reqtxt_file, "r", filenr, file_length);
uemis_increased_timeout(&timeout); uemis_increased_timeout(&timeout);
} }