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/gpslocation.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/gpslocation.cpp')
| -rw-r--r-- | core/gpslocation.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp index e0b176f58..d0bbcdc8f 100644 --- a/core/gpslocation.cpp +++ b/core/gpslocation.cpp @@ -137,7 +137,9 @@ QString GpsLocation::currentPosition() if (delta < 300) { // we can simply use the last position that we tracked gpsTracker gt = m_trackers.last(); - QString gpsString = printGPSCoords(>.location); + char *gps = printGPSCoords(>.location); + QString gpsString = gps; + free(gps); qDebug() << "returning last position" << gpsString; return gpsString; } else { |