From a32462c26b55ff1d28ec9d126655828511a89c35 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 7 Jan 2014 16:41:21 +0200 Subject: DownloadFromDCWidget: prevent possible leaks for log/dump files 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 Signed-off-by: Dirk Hohndel --- qt-ui/downloadfromdivecomputer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qt-ui/downloadfromdivecomputer.cpp') diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index b9eee912a..81bc04309 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -288,8 +288,11 @@ void DownloadFromDCWidget::pickLogFile() filename = fi.absolutePath().append(QDir::separator()).append("subsurface.log"); logFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer download logfile"), filename, tr("Log files (*.log)")); - if (!logFile.isEmpty()) + if (!logFile.isEmpty()) { + if (logfile_name) + free(logfile_name); logfile_name = strdup(logFile.toUtf8().data()); + } } void DownloadFromDCWidget::checkDumpFile(int state) @@ -314,8 +317,11 @@ void DownloadFromDCWidget::pickDumpFile() filename = fi.absolutePath().append(QDir::separator()).append("subsurface.bin"); dumpFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer binary dump file"), filename, tr("Dump files (*.bin)")); - if (!dumpFile.isEmpty()) + if (!dumpFile.isEmpty()) { + if (dumpfile_name) + free(dumpfile_name); dumpfile_name = strdup(dumpFile.toUtf8().data()); + } } void DownloadFromDCWidget::reject() -- cgit v1.2.3-70-g09d2