From 04593e8ec4bac2606dec54605c72a6a49cc83f9b Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 24 Mar 2019 21:50:01 +0100 Subject: 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 --- desktop-widgets/locationinformation.cpp | 8 ++++---- desktop-widgets/modeldelegates.cpp | 4 ++-- desktop-widgets/tab-widgets/maintab.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 7356f8370..f4da411af 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -114,9 +114,9 @@ void LocationInformationWidget::updateLabels() else ui.diveSiteNotes->clear(); if (has_location(&diveSite->location)) { - const char *coords = printGPSCoords(&diveSite->location); + char *coords = printGPSCoords(&diveSite->location); ui.diveSiteCoordinates->setText(coords); - free((void *)coords); + free(coords); } else { ui.diveSiteCoordinates->clear(); } @@ -138,10 +138,10 @@ void LocationInformationWidget::updateGpsCoordinates(const location_t &location) { QString oldText = ui.diveSiteCoordinates->text(); - const char *coords = printGPSCoords(&location); + char *coords = printGPSCoords(&location); ui.diveSiteCoordinates->setText(coords); enableLocationButtons(has_location(&location)); - free((void *)coords); + free(coords); if (oldText != ui.diveSiteCoordinates->text()) markChangedWidget(ui.diveSiteCoordinates); } diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index a237c1306..c6405a433 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -484,9 +484,9 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem } if (bottomText.isEmpty()) { - const char *gpsCoords = printGPSCoords(&ds->location); + char *gpsCoords = printGPSCoords(&ds->location); bottomText = QString(gpsCoords); - free( (void*) gpsCoords); + free(gpsCoords); } if (dive_site_has_gps_location(ds) && currentDiveSiteHasGPS) { diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 11ad99d50..a2ff15368 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -411,9 +411,9 @@ void MainTab::updateDiveInfo(bool clear) ui.locationTags->setText(constructLocationTags(&ds->taxonomy, true)); if (ui.locationTags->text().isEmpty() && has_location(&ds->location)) { - const char *coords = printGPSCoords(&ds->location); + char *coords = printGPSCoords(&ds->location); ui.locationTags->setText(coords); - free((void *)coords); + free(coords); } } else { ui.location->clear(); -- cgit v1.2.3-70-g09d2