[PATCH weston 08/11] tablet-shell: Avoid leaking the path on failed icon loading

Rob Bradford robert.bradford at intel.com
Fri Jul 26 08:29:42 PDT 2013


From: Rob Bradford <rob at linux.intel.com>

---
 clients/tablet-shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c
index 3d5e79a..d7aac70 100644
--- a/clients/tablet-shell.c
+++ b/clients/tablet-shell.c
@@ -396,7 +396,6 @@ tablet_shell_add_launcher(struct tablet *tablet,
 	struct homescreen *homescreen = tablet->homescreen;
 
 	launcher = malloc(sizeof *launcher);
-	launcher->path = strdup(path);
 	launcher->icon = load_cairo_surface(icon);
 	if ( !launcher->icon ||
 	     cairo_surface_status (launcher->icon) != CAIRO_STATUS_SUCCESS) {
@@ -404,6 +403,7 @@ tablet_shell_add_launcher(struct tablet *tablet,
 		free(launcher);
 		return;
 	}
+	launcher->path = strdup(path);
 
 	launcher->homescreen = homescreen;
 	launcher->widget = widget_add_widget(homescreen->widget, launcher);
-- 
1.8.3.1



More information about the wayland-devel mailing list