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

Merge branch 'backport-2626-2627-leak-fixes-glib-2-72' into 'glib-2-72'

Browse Source 
Backport ,  minor leak fixes to glib-2-72

See merge request
This commit is contained in:
Sebastian Dröge 2022-04-29 07:58:19 +00:00
commit 210416bbc0
2 changed files with 8 additions and 6 deletions

10
gio/gio-tool-set.c

@ -76,12 +76,14 @@ handle_set (int argc, char *argv[], gboolean do_help)
const char *attribute;
GFileAttributeType type;
gpointer value;
gpointer value_allocated = NULL;
gboolean b;
guint32 uint32;
gint32 int32;
guint64 uint64;
gint64 int64;
gchar *param;
int retval = 0;
g_set_prgname ("gio set");
@ -147,7 +149,7 @@ handle_set (int argc, char *argv[], gboolean do_help)
value = argv[3];
break;
case G_FILE_ATTRIBUTE_TYPE_BYTE_STRING:
value = hex_unescape (argv[3]);
value = value_allocated = hex_unescape (argv[3]);
break;
case G_FILE_ATTRIBUTE_TYPE_BOOLEAN:
b = g_ascii_strcasecmp (argv[3], "true") == 0;
@ -194,11 +196,11 @@ handle_set (int argc, char *argv[], gboolean do_help)
{
print_error ("%s", error->message);
g_error_free (error);
g_object_unref (file);
return 1;
retval = 1;
}
g_clear_pointer (&value_allocated, g_free);
g_object_unref (file);
return 0;
return retval;
}

4
gio/gopenuriportal.c

@ -108,10 +108,10 @@ g_openuri_portal_open_uri (const char *uri,
errsv = errno;
if (fd == -1)
{
g_free (path);
g_variant_builder_clear (&opt_builder);
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
"Failed to open '%s'", path);
g_free (path);
g_variant_builder_clear (&opt_builder);
return FALSE;
}