luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio-tool: Fix memory leaks on error paths in mount command

Browse Source 
Various GErrors were being leaked.

Coverity CID: 1357351 (amongst others)
This commit is contained in:
Philip Withnall 2016-07-11 21:56:04 +01:00
parent 996bb34986
commit a9172c6d03
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gio-tool-mount.c
View File

@ -246,6 +246,8 @@ mount_mountable_done_cb (GObject *object,
g_printerr (_("Error mounting location: Anonymous access denied\n")); g_printerr (_("Error mounting location: Anonymous access denied\n"));
else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED)) else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
g_printerr (_("Error mounting location: %s\n"), error->message); g_printerr (_("Error mounting location: %s\n"), error->message);
g_error_free (error);
} }
else else
g_object_unref (target); g_object_unref (target);
@ -274,6 +276,8 @@ mount_done_cb (GObject *object,
g_printerr (_("Error mounting location: Anonymous access denied\n")); g_printerr (_("Error mounting location: Anonymous access denied\n"));
else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED)) else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
g_printerr (_("Error mounting location: %s\n"), error->message); g_printerr (_("Error mounting location: %s\n"), error->message);
g_error_free (error);
} }
outstanding_mounts--; outstanding_mounts--;
@ -336,6 +340,7 @@ unmount_done_cb (GObject *object,
{ {
g_printerr (_("Error unmounting mount: %s\n"), error->message); g_printerr (_("Error unmounting mount: %s\n"), error->message);
success = FALSE; success = FALSE;
g_error_free (error);
} }
outstanding_mounts--; outstanding_mounts--;
@ -360,6 +365,7 @@ unmount (GFile *file)
{ {
g_printerr (_("Error finding enclosing mount: %s\n"), error->message); g_printerr (_("Error finding enclosing mount: %s\n"), error->message);
success = FALSE; success = FALSE;
g_error_free (error);
return; return;
} }
@ -387,6 +393,7 @@ eject_done_cb (GObject *object,
{ {
g_printerr (_("Error ejecting mount: %s\n"), error->message); g_printerr (_("Error ejecting mount: %s\n"), error->message);
success = FALSE; success = FALSE;
g_error_free (error);
} }
outstanding_mounts--; outstanding_mounts--;
@ -411,6 +418,7 @@ eject (GFile *file)
{ {
g_printerr (_("Error finding enclosing mount: %s\n"), error->message); g_printerr (_("Error finding enclosing mount: %s\n"), error->message);
success = FALSE; success = FALSE;
g_error_free (error);
return; return;
} }
@ -867,6 +875,7 @@ mount_with_device_file_cb (GObject *object,
g_printerr (_("Error mounting %s: %s\n"), g_printerr (_("Error mounting %s: %s\n"),
g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE), g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE),
error->message); error->message);
g_error_free (error);
success = FALSE; success = FALSE;
} }
else else