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

4
core/gpslocation.cpp
View file

@ -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(&gt.location);
char *gps = printGPSCoords(&gt.location);
QString gpsString = gps;
free(gps);
qDebug() << "returning last position" << gpsString;
return gpsString;
} else {

4
core/load-git.c
View file

@ -164,10 +164,10 @@ static void parse_dive_gps(char *line, struct membuffer *str, void *_dive)
dive->dive_site = ds;
} else {
if (dive_site_has_gps_location(ds) && !same_location(&ds->location, &location)) {
const char *coords = printGPSCoords(&location);
char *coords = printGPSCoords(&location);
// we have a dive site that already has GPS coordinates
ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords);
free((void *)coords);
free(coords);
}
ds->location = location;
}

4
core/parse-xml.c
View file

@ -1201,9 +1201,9 @@ static void gps_in_dive(char *buffer, struct dive *dive, struct parser_state *st
fprintf(stderr, "dive site uuid in dive, but gps location (%10.6f/%10.6f) different from dive location (%10.6f/%10.6f)\n",
ds->location.lat.udeg / 1000000.0, ds->location.lon.udeg / 1000000.0,
location.lat.udeg / 1000000.0, location.lon.udeg / 1000000.0);
const char *coords = printGPSCoords(&location);
char *coords = printGPSCoords(&location);
ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords);
free((void *)coords);
free(coords);
} else {
ds->location = location;
}

2
core/qthelper.cpp
View file

@ -72,7 +72,7 @@ QString distance_string(int distanceInMeters)
return str;
}
extern "C" const char *printGPSCoords(const location_t *location)
extern "C" char *printGPSCoords(const location_t *location)
{
int lat = location->lat.udeg;
int lon = location->lon.udeg;

2
core/qthelper.h
View file

@ -123,7 +123,7 @@ void moveInVector(Vector &v, int rangeBegin, int rangeEnd, int destination)
extern "C" {
#endif
const char *printGPSCoords(const location_t *loc);
char *printGPSCoords(const location_t *loc);
bool in_planner();
bool getProxyString(char **buffer);
bool canReachCloudServer();

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