X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=fd5f5a6f797f8a37a823e947ba8d731714db8fe9;hb=26c37c4140ce5739d646c104f1e378b2c5d8ec27;hp=926cb2c63ca40f4ff2eb859922a4c0477c3cb747;hpb=e5016cbc47b46b86a50d9a6ca71269a62664efbe;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 926cb2c..fd5f5a6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -754,6 +754,10 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 		}
 
 		ivi_output = zalloc(sizeof(*ivi_output));
+		if (!ivi_output) {
+			free(_name);
+			continue;
+		}
 
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
@@ -806,6 +810,10 @@ ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
 		}
 
 		ivi_output = zalloc(sizeof(*ivi_output));
+		if (!ivi_output) {
+			free(_name);
+			continue;
+		}
 
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
@@ -1760,6 +1768,11 @@ int wet_main(int argc, char *argv[])
 	wl_display_destroy_clients(display);
 
 error_compositor:
+	free(backend);
+	backend = NULL;
+	free(modules);
+	modules = NULL;
+
 	weston_compositor_tear_down(ivi.compositor);
 
 	weston_compositor_log_scope_destroy(log_scope);