From: mardy <mardy@users.sourceforge.net>
Date: Mon, 4 Feb 2008 21:17:33 +0000 (+0000)
Subject: Fix some memory leaks. Fixes: #2099.
X-Git-Tag: fremantle/3.0+alpha0~180
X-Git-Url: http://git.itanic.dy.fi/?p=maemo-mapper;a=commitdiff_plain;h=9091b4632e1667dc2125e0313cc24cc5170b8a66

Fix some memory leaks. Fixes: #2099.


git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@154 6c538b50-5814-0410-93ad-8bdf4c0149d1
---

diff --git a/src/gps.c b/src/gps.c
index 3773d9c..abf142c 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -908,6 +908,7 @@ gps_init()
         gchar *path_env = getenv("PATH");
         gchar *new_path = g_strdup_printf("%s:%s", path_env, "/usr/sbin");
         setenv("PATH", new_path, 1);
+        g_free(new_path);
     }
 
     /* set _gpsoffset */
diff --git a/src/main.c b/src/main.c
index df73b24..0ce0c1e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -329,8 +329,7 @@ maemo_mapper_init(gint argc, gchar **argv)
     /* Set up track array (must be done before config). */
     memset(&_track, 0, sizeof(_track));
     memset(&_route, 0, sizeof(_route));
-    MACRO_PATH_INIT(_track);
-    MACRO_PATH_INIT(_route);
+    /* initialisation of paths is done in path_init() */
 
     _mapdb_mutex = g_mutex_new();
     _mut_priority_mutex = g_mutex_new();
diff --git a/src/path.c b/src/path.c
index 5c8aa0e..b00796f 100644
--- a/src/path.c
+++ b/src/path.c
@@ -653,8 +653,10 @@ route_download_and_setup(GtkWidget *parent, const gchar *source_url,
     }
 
     /* Attempt to download the route from the server. */
-    if(GNOME_VFS_OK != (vfs_result = gnome_vfs_read_entire_file(
-                buffer, &size, &bytes)))
+    vfs_result = gnome_vfs_read_entire_file(buffer, &size, &bytes);
+    g_free (buffer);
+
+    if(vfs_result != GNOME_VFS_OK)
     {
         g_free(bytes);
         popup_error(parent, gnome_vfs_result_to_string(vfs_result));
diff --git a/src/settings.c b/src/settings.c
index 917dd71..9164f36 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1893,9 +1893,12 @@ settings_init()
                 GCONF_KEY_GPS_RCVR_TYPE, NULL);
         gint i = 0;
         if(gri_type_str)
+        {
             for(i = GPS_RCVR_ENUM_COUNT - 1; i > 0; i--)
                 if(!strcmp(gri_type_str, GPS_RCVR_ENUM_TEXT[i]))
                     break;
+            g_free(gri_type_str);
+        }
         _gri.type = i;
     }