isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 04:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogland: Don't leak the shell surface struct if requested twice

Browse Source 
If the shell surface is requested twice then Cogland will hit an error
path but it would end up leaking the CoglandShellSurface struct it
allocated.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 622d41b04c2689a8e4fb6e1769aaf887a04242e8)
This commit is contained in:
Neil Roberts 2013-04-11 12:43:53 +01:00
parent 2f3591ace0
commit efa3bd03c5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/cogland.c
View File

@ -976,7 +976,7 @@ get_shell_surface (struct wl_client *client,
struct wl_resource *surface_resource) struct wl_resource *surface_resource)
{ {
CoglandSurface *surface = surface_resource->data; CoglandSurface *surface = surface_resource->data;
CoglandShellSurface *shell_surface = g_new0 (CoglandShellSurface, 1); CoglandShellSurface *shell_surface;
if (surface->has_shell_surface) if (surface->has_shell_surface)
{ {
@ -986,6 +986,7 @@ get_shell_surface (struct wl_client *client,
return; return;
} }
shell_surface = g_new0 (CoglandShellSurface, 1);
shell_surface->resource.destroy = destroy_shell_surface; shell_surface->resource.destroy = destroy_shell_surface;
shell_surface->resource.object.id = id; shell_surface->resource.object.id = id;
shell_surface->resource.object.interface = &wl_shell_surface_interface; shell_surface->resource.object.interface = &wl_shell_surface_interface;