tablet-shell: Avoid leaking icon or path strings from invalid launcher section
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 9 Oct 2013 20:05:55 +0000 (13:05 -0700)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 10 Oct 2013 23:50:18 +0000 (16:50 -0700)
clients/tablet-shell.c

index 094823c..45733b1 100644 (file)
@@ -454,12 +454,11 @@ int main(int argc, char *argv[])
                weston_config_section_get_string(s, "icon", &icon, NULL);
                weston_config_section_get_string(s, "path", &path, NULL);
 
-               if (icon == NULL || path == NULL) {
+               if (icon != NULL && path != NULL)
+                       tablet_shell_add_launcher(&tablet, icon, path);
+               else
                        fprintf(stderr, "invalid launcher section\n");
-                       continue;
-               }
 
-               tablet_shell_add_launcher(&tablet, icon, path);
                free(icon);
                free(path);
        }