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

Cleanup: fix printGPSCoords signature and leaks

Browse source 
The printGPSCoords() function returns a copied C-style string. Since
the owndership is transferred to the caller, the correct return type
is "char *" instead of "const char *".

Thus a number of casts when calling free can be removed.

Moreover a number of callers didn't free the string and thus were
leaking memory. Fix them. Ultimately we might want two versions
of the function: one for QString, one for C-style strings.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-24 21:50:01 +01:00 • committed by Dirk Hohndel
parent 8facd937f8
commit 04593e8ec4
11 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -112,7 +112,12 @@ QString DiveObjectHelper::location() const
QString DiveObjectHelper::gps() const
{
struct dive_site *ds = m_dive->dive_site;
return ds ? QString(printGPSCoords(&ds->location)) : QString();
if (!ds)
return QString();
char *gps = printGPSCoords(&ds->location);
QString res = gps;
free(gps);
return res;
}
QString DiveObjectHelper::gps_decimal() const