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 --- mobile-widgets/qmlmanager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 8973aef43..d9da5e562 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1602,9 +1602,12 @@ QString QMLManager::getGpsFromSiteName(const QString& siteName) struct dive_site *ds; ds = get_dive_site_by_name(qPrintable(siteName)); - if (ds) - return QString(printGPSCoords(&ds->location)); - return QString(); + if (!ds) + return QString(); + char *gps = printGPSCoords(&ds->location); + QString res = gps; + free(gps); + return res; } void QMLManager::setNotificationText(QString text) -- cgit v1.2.3-70-g09d2