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

DownloadFromDCWidget: prevent possible leaks for log/dump files

Browse source 
If the 'logfile_name' and 'dumpfile_name' were NULL we can simply
strdup() them with a new value, but if there was a previous value
we need to free() first.

C99 6.7.8 allows us to keep said variables without the
explicit NULL initialiazation.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2014-01-07 16:41:21 +02:00 • committed by Dirk Hohndel
parent 065221aac7
commit 7d56e404fd
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/downloadfromdivecomputer.cpp
View file

@ -288,8 +288,11 @@ void DownloadFromDCWidget::pickLogFile()
filename = fi.absolutePath().append(QDir::separator()).append("subsurface.log"); filename = fi.absolutePath().append(QDir::separator()).append("subsurface.log");
logFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer download logfile"), logFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer download logfile"),
filename, tr("Log files (*.log)")); filename, tr("Log files (*.log)"));
if (!logFile.isEmpty()) if (!logFile.isEmpty()) {
if (logfile_name)
free(logfile_name);
logfile_name = strdup(logFile.toUtf8().data()); logfile_name = strdup(logFile.toUtf8().data());
}
} }
void DownloadFromDCWidget::checkDumpFile(int state) void DownloadFromDCWidget::checkDumpFile(int state)
@ -314,8 +317,11 @@ void DownloadFromDCWidget::pickDumpFile()
filename = fi.absolutePath().append(QDir::separator()).append("subsurface.bin"); filename = fi.absolutePath().append(QDir::separator()).append("subsurface.bin");
dumpFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer binary dump file"), dumpFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer binary dump file"),
filename, tr("Dump files (*.bin)")); filename, tr("Dump files (*.bin)"));
if (!dumpFile.isEmpty()) if (!dumpFile.isEmpty()) {
if (dumpfile_name)
free(dumpfile_name);
dumpfile_name = strdup(dumpFile.toUtf8().data()); dumpfile_name = strdup(dumpFile.toUtf8().data());
}
} }
void DownloadFromDCWidget::reject() void DownloadFromDCWidget::reject()