osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix the check for ws_fdopen() failure. 

If tf.handle() fails, it returns -1; we shouldn't call ws_fdopen() on
its return value.  (I'm not sure whether it can fail, but this code is
all a bit twisty.)

If tf.handle() succeeds, and we hand its return value to ws_fdopen(),
and we get back NULL, *that* indicates that ws_fdopen() failed.

This should fix Coverity CID 1457929, preventing a FILE leak.

Change-Id: I23bb04579d26928037f8b9284b7741affc3596f7
Reviewed-on: https://code.wireshark.org/review/35940
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2020-01-24 10:17:22 -08:00
parent 8a79d27010
commit 0b64a3afc0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/qt/endpoint_dialog.cpp
View File

@ -208,13 +208,23 @@ QUrl EndpointDialog::createMap(bool json_only)
return QUrl();
}
int fd = tf.handle();
FILE* fp = ws_fdopen(fd, "wb");
//
// XXX - QFileDevice.handle() can return -1, but can QTemporaryFile.handle()
// do so if QTemporaryFile.open() has succeeded?
//
if (fd == -1) {
QMessageBox::warning(this, tr("Map file error"), tr("Unable to create temporary file"));
g_free(hosts);
tf.remove();
return QUrl();
}
FILE* fp = ws_fdopen(fd, "wb");
if (fp == NULL) {
QMessageBox::warning(this, tr("Map file error"), tr("Unable to create temporary file"));
g_free(hosts);
tf.remove();
return QUrl();
}
gchar *err_str;
if (!write_endpoint_geoip_map(fp, json_only, hosts, &err_str)) {