From: tsteven4 <tsteven4@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 1 Aug 2013 01:38:56 +0000 (+0000)
Subject: Fix some memory leaks in csv_util.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~465
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2fe0110871401244ad8042e39ad34857a92833b;p=gpsbabel.git

Fix some memory leaks in csv_util.
---

diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc
index 051d4619c..2056a405e 100644
--- a/gpsbabel/csv_util.cc
+++ b/gpsbabel/csv_util.cc
@@ -991,13 +991,13 @@ xcsv_parse_val(const char* s, waypoint* wpt, const field_map_t* fmp,
     wpt->notes = csv_stringtrim(s, "", 0);
     break;
   case XT_URL:
-    wpt->url = csv_stringtrim(s, "", 0);
+    wpt->url = QString(s).trimmed();
     break;
   case XT_URL_LINK_TEXT:
-    wpt->url_link_text = csv_stringtrim(s, "", 0);
+    wpt->url_link_text = QString(s).trimmed();
     break;
   case XT_ICON_DESCR:
-    wpt->icon_descr = csv_stringtrim(s, "", 0);
+    wpt->icon_descr = QString(s).trimmed();
     break;
 
     /* LATITUDE CONVERSIONS**************************************************/
@@ -1206,10 +1206,10 @@ fatal("XT_NET_TIME can't have possibly ever worked.");
     waypt_alloc_gc_data(wpt)->container = gs_mkcont(s);
     break;
   case XT_GEOCACHE_HINT:
-    waypt_alloc_gc_data(wpt)->hint = csv_stringtrim(s, "", 0);
+    waypt_alloc_gc_data(wpt)->hint = QString(s).trimmed();
     break;
   case XT_GEOCACHE_PLACER:
-    waypt_alloc_gc_data(wpt)->placer = csv_stringtrim(s, "", 0);
+    waypt_alloc_gc_data(wpt)->placer = QString(s).trimmed();
     break;
   case XT_GEOCACHE_ISAVAILABLE:
     gc_data = waypt_alloc_gc_data(wpt);