diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-24 21:50:01 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-24 21:57:13 -0700 |
| commit | 04593e8ec4bac2606dec54605c72a6a49cc83f9b (patch) | |
| tree | 030da73608ad9bf1653b5018404b3a5514e6c7bd /core/subsurface-qt/DiveObjectHelper.cpp | |
| parent | 8facd937f86d913d94275abb80bfa4d2b181bbc6 (diff) | |
| download | subsurface-04593e8ec4bac2606dec54605c72a6a49cc83f9b.tar.gz | |
Cleanup: fix printGPSCoords signature and leaks
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>
Diffstat (limited to 'core/subsurface-qt/DiveObjectHelper.cpp')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 0742e382f..921d55bea 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -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 |