brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

background: fix pixbuf leak in load_file_finish

Browse Source 
g_task_propagate_pointer relinishes the GTask
of its reference to the propagated pointer, so we need to
unref it ourselves when we're done with it.

https://bugzilla.gnome.org/show_bug.cgi?id=696157
This commit is contained in:
Ray Strode 2013-03-24 23:53:15 -04:00
parent 5ed6e37e3c
commit 13c7020b80
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compositor/meta-background.c
View File

@ -1156,6 +1156,7 @@ meta_background_load_file_finish (MetaBackground *self,
int width, height, row_stride; int width, height, row_stride;
guchar *pixels; guchar *pixels;
gboolean has_alpha; gboolean has_alpha;
gboolean loaded = FALSE;
g_return_val_if_fail (g_task_is_valid (result, self), FALSE); g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
@ -1164,7 +1165,7 @@ meta_background_load_file_finish (MetaBackground *self,
pixbuf = g_task_propagate_pointer (task, error); pixbuf = g_task_propagate_pointer (task, error);
if (pixbuf == NULL) if (pixbuf == NULL)
return FALSE; goto out;
task_data = g_task_get_task_data (task); task_data = g_task_get_task_data (task);
@ -1190,7 +1191,7 @@ meta_background_load_file_finish (MetaBackground *self,
COGL_BITMAP_ERROR, COGL_BITMAP_ERROR,
COGL_BITMAP_ERROR_FAILED, COGL_BITMAP_ERROR_FAILED,
_("background texture could not be created from file")); _("background texture could not be created from file"));
return FALSE; goto out;
} }
cogl_object_set_user_data (COGL_OBJECT (texture), cogl_object_set_user_data (COGL_OBJECT (texture),
@ -1206,8 +1207,12 @@ meta_background_load_file_finish (MetaBackground *self,
set_texture (self, texture); set_texture (self, texture);
clutter_content_invalidate (CLUTTER_CONTENT (self)); clutter_content_invalidate (CLUTTER_CONTENT (self));
loaded = TRUE;
return TRUE; out:
if (pixbuf != NULL)
g_object_unref (pixbuf);
return loaded;
} }
/** /**