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

Don't leak memory on downloaded dives not picked

Browse source 
I noticed this in the mobile download code when fixing an unrelated
issue - and then realized that the same was true in the desktop app
as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-05-29 10:32:32 -07:00
parent 76a38b6326
commit 57d01701aa
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -421,6 +421,8 @@ void DownloadFromDCWidget::on_ok_clicked()
for (int i = 0; i < downloadTable.nr; i++) { for (int i = 0; i < downloadTable.nr; i++) {
if (diveImportedModel->data(diveImportedModel->index(i, 0),Qt::CheckStateRole) == Qt::Checked) if (diveImportedModel->data(diveImportedModel->index(i, 0),Qt::CheckStateRole) == Qt::Checked)
record_dive(downloadTable.dives[i]); record_dive(downloadTable.dives[i]);
else
clear_dive(downloadTable.dives[i]);
downloadTable.dives[i] = NULL; downloadTable.dives[i] = NULL;
} }
downloadTable.nr = 0; downloadTable.nr = 0;

13
qt-models/diveimportedmodel.cpp
View file

@ -148,11 +148,18 @@ void DiveImportedModel::repopulate()
void DiveImportedModel::recordDives() void DiveImportedModel::recordDives()
{ {
// walk the table of imported dives and record the ones that the user picked
// clearing out the table as we go
for (int i = 0; i < rowCount(); i++) { for (int i = 0; i < rowCount(); i++) {
if (diveTable->dives[i] && checkStates[i]) { struct dive *d = diveTable->dives[i];
record_dive(diveTable->dives[i]); if (d && checkStates[i]) {
diveTable->dives[i] = NULL; record_dive(d);
} else {
// we should free the dives that weren't recorded
clear_dive(d);
free(d)
} }
diveTable->dives[i] = NULL;
} }
diveTable->nr = 0; diveTable->nr = 0;
} }