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

weston: Fix memleak issue in compositor.c

Browse Source 
Based on a previous patch by Hardening <rdp.effort@gmail.com>.

Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com>
This commit is contained in:
Srivardhan Hebbar
2014-05-27 14:30:59 +05:30
committed by Kristian Høgsberg
parent 6ac60c1791
commit ba2a36d5c5
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+17 -6
View File
@@ -4229,6 +4229,11 @@ int main(int argc, char *argv[])
signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
NULL); NULL);
if (!signals[0] || !signals[1] || !signals[2] || !signals[3]) {
ret = EXIT_FAILURE;
goto out_signals;
}
if (noconfig == 0) if (noconfig == 0)
config = weston_config_parse("weston.ini"); config = weston_config_parse("weston.ini");
if (config != NULL) { if (config != NULL) {
@@ -4256,13 +4261,16 @@ int main(int argc, char *argv[])
backend_init = weston_load_module(backend, "backend_init"); backend_init = weston_load_module(backend, "backend_init");
free(backend); free(backend);
if (!backend_init) if (!backend_init) {
exit(EXIT_FAILURE); ret = EXIT_FAILURE;
goto out_signals;
}
ec = backend_init(display, &argc, argv, config); ec = backend_init(display, &argc, argv, config);
if (ec == NULL) { if (ec == NULL) {
weston_log("fatal: failed to create compositor\n"); weston_log("fatal: failed to create compositor\n");
exit(EXIT_FAILURE); ret = EXIT_FAILURE;
goto out_signals;
} }
catch_signals(); catch_signals();
@@ -4343,12 +4351,15 @@ int main(int argc, char *argv[])
wl_signal_emit(&ec->destroy_signal, ec); wl_signal_emit(&ec->destroy_signal, ec);
for (i = ARRAY_LENGTH(signals); i;)
wl_event_source_remove(signals[--i]);
weston_compositor_xkb_destroy(ec); weston_compositor_xkb_destroy(ec);
ec->destroy(ec); ec->destroy(ec);
out_signals:
for (i = ARRAY_LENGTH(signals) - 1; i >= 0; i--)
if (signals[i])
wl_event_source_remove(signals[i]);
wl_display_destroy(display); wl_display_destroy(display);
weston_log_file_close(); weston_log_file_close();