summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2008-05-30 18:50:28 -0400
committerDavid Zeuthen <davidz@redhat.com>2008-05-30 18:50:28 -0400
commit2f8531b794efd07b60237acbf69c79069634d5e9 (patch)
treefe9bb5385115e22751834bbb351493e899fecc07 /src
parentb12afba65821859283c533634dbcf483ccd63d6c (diff)
don't free data on error paths
Apparently the generated glue (or dbus-glib) doesn't zero out the results on error paths :-/
Diffstat (limited to 'src')
-rw-r--r--src/gdu-device.c3
-rw-r--r--src/gdu-section-unallocated.c2
-rw-r--r--src/gdu-shell.c3
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gdu-device.c b/src/gdu-device.c
index 898bf95..5ec6333 100644
--- a/src/gdu-device.c
+++ b/src/gdu-device.c
@@ -1121,8 +1121,7 @@ op_mount_cb (DBusGProxy *proxy, char *mount_path, GError *error, gpointer user_d
{
FilesystemMountData *data = user_data;
if (data->callback != NULL)
- data->callback (data->device, g_strdup (mount_path), error, data->user_data);
- g_free (mount_path);
+ data->callback (data->device, mount_path, error, data->user_data);
g_object_unref (data->device);
g_free (data);
}
diff --git a/src/gdu-section-unallocated.c b/src/gdu-section-unallocated.c
index cf8979a..ed34657 100644
--- a/src/gdu-section-unallocated.c
+++ b/src/gdu-section-unallocated.c
@@ -122,11 +122,11 @@ create_partition_completed (GduDevice *device,
}
g_object_unref (pool);
+ g_free (created_device_object_path);
}
if (data != NULL)
create_partition_data_free (data);
- g_free (created_device_object_path);
}
static void
diff --git a/src/gdu-shell.c b/src/gdu-shell.c
index 866797b..9a7e601 100644
--- a/src/gdu-shell.c
+++ b/src/gdu-shell.c
@@ -802,8 +802,9 @@ mount_op_callback (GduDevice *device,
if (error != NULL) {
gdu_shell_raise_error (data->shell, data->presentable, error);
g_error_free (error);
+ } else {
+ g_free (mount_point);
}
- g_free (mount_point);
shell_presentable_free (data);
}