tablet-shell: Avoid leaking the path on failed icon loading
authorRob Bradford <rob@linux.intel.com>
Fri, 26 Jul 2013 15:29:42 +0000 (16:29 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 30 Jul 2013 18:05:23 +0000 (11:05 -0700)
clients/tablet-shell.c

index 3d5e79a..d7aac70 100644 (file)
@@ -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);