mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clients/desktop-shell: check OOM conditions

Browse Source 
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff
2014-01-15 10:59:50 -08:00
committed by Kristian Høgsberg
parent 13708a4d67
commit 3c946779df
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+9 -1
View File
@@ -21,12 +21,15 @@
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
*/ */
#include "config.h"
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <math.h> #include <math.h>
#include <cairo.h> #include <cairo.h>
#include <sys/wait.h> #include <sys/wait.h>
@@ -609,7 +612,7 @@ panel_add_launcher(struct panel *panel, const char *icon, const char *path)
launcher = xzalloc(sizeof *launcher); launcher = xzalloc(sizeof *launcher);
launcher->icon = load_icon_or_fallback(icon); launcher->icon = load_icon_or_fallback(icon);
launcher->path = strdup(path); launcher->path = xstrdup(path);
wl_array_init(&launcher->envp); wl_array_init(&launcher->envp);
wl_array_init(&launcher->argv); wl_array_init(&launcher->argv);
@@ -1061,6 +1064,11 @@ background_create(struct desktop *desktop)
weston_config_section_get_string(s, "background-type", weston_config_section_get_string(s, "background-type",
&type, "tile"); &type, "tile");
if (type == NULL) {
fprintf(stderr, "%s: out of memory\n", program_invocation_short_name);
exit(EXIT_FAILURE);
}
if (strcmp(type, "scale") == 0) { if (strcmp(type, "scale") == 0) {
background->type = BACKGROUND_SCALE; background->type = BACKGROUND_SCALE;
} else if (strcmp(type, "scale-crop") == 0) { } else if (strcmp(type, "scale-crop") == 0) {