Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
agl-compositor:Add NULL check after zalloc in src directory
[src/agl-compositor.git]
/
src
/
compositor.c
diff --git
a/src/compositor.c
b/src/compositor.c
index
22c4979
..
2bbdce8
100644
(file)
--- a/
src/compositor.c
+++ b/
src/compositor.c
@@
-39,7
+39,9
@@
#include <libweston/backend-drm.h>
#include <libweston/backend-wayland.h>
#include <libweston/backend-drm.h>
#include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_HEADLESS
#include <libweston/backend-headless.h>
#include <libweston/backend-headless.h>
+#endif
#ifdef HAVE_BACKEND_X11
#include <libweston/backend-x11.h>
#endif
#ifdef HAVE_BACKEND_X11
#include <libweston/backend-x11.h>
#endif
@@
-752,6
+754,10
@@
ivi_enable_remote_outputs(struct ivi_compositor *ivi)
}
ivi_output = zalloc(sizeof(*ivi_output));
}
ivi_output = zalloc(sizeof(*ivi_output));
+ if (!ivi_output) {
+ free(_name);
+ continue;
+ }
ivi_output->ivi = ivi;
ivi_output->name = _name;
ivi_output->ivi = ivi;
ivi_output->name = _name;
@@
-804,6
+810,10
@@
ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
}
ivi_output = zalloc(sizeof(*ivi_output));
}
ivi_output = zalloc(sizeof(*ivi_output));
+ if (!ivi_output) {
+ free(_name);
+ continue;
+ }
ivi_output->ivi = ivi;
ivi_output->name = _name;
ivi_output->ivi = ivi;
ivi_output->name = _name;
@@
-1087,6
+1097,7
@@
load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
}
#endif
}
#endif
+#ifdef HAVE_BACKEND_HEADLESS
static int
load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
{
static int
load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
{
@@
-1134,6
+1145,13
@@
load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
return 0;
}
return 0;
}
+#else
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+ return -1;
+}
+#endif
static int
load_backend(struct ivi_compositor *ivi, const char *backend,
static int
load_backend(struct ivi_compositor *ivi, const char *backend,
@@
-1177,6
+1195,14
@@
load_modules(struct ivi_compositor *ivi, const char *modules,
continue;
}
continue;
}
+ if (strstr(buffer, "systemd-notify.so")) {
+ weston_log("systemd-notify plug-in already loaded!\n");
+ p = end;
+ while (*p == ',')
+ p++;
+ continue;
+ }
+
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;
@@
-1240,7
+1266,7
@@
compositor_init_config(struct weston_compositor *compositor,
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
- &vt_switching,
tru
e);
+ &vt_switching,
fals
e);
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */