From ab6c4648de49ab983d4b82ed6e9fe8e2f44448e5 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Mon, 29 Apr 2019 20:33:32 +0900 Subject: [PATCH] output: fix crash when deinit Change-Id: If711c5a377e053406e3c8d27998d5c519b6c384b Signed-off-by: Sung-Jin Park --- src/bin/headless/output/output_led.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/headless/output/output_led.c b/src/bin/headless/output/output_led.c index aa5f710..d346a13 100644 --- a/src/bin/headless/output/output_led.c +++ b/src/bin/headless/output/output_led.c @@ -347,13 +347,17 @@ headless_output_deinit(pepper_compositor_t *compositor) { led_output_t *output; + output = pepper_object_get_user_data((pepper_object_t *)compositor, &KEY_OUTPUT); - pepper_output_destroy(output->output); - led_output_destroy(output); + if (output) { + pepper_object_set_user_data((pepper_object_t *)compositor, &KEY_OUTPUT, NULL, NULL); + + pepper_output_destroy(output->output); + led_output_destroy(output); - pepper_object_set_user_data((pepper_object_t *)compositor, &KEY_OUTPUT, NULL, NULL); - free(output); + free(output); + } PEPPER_TRACE("Output Deinit ... DONE\n"); } -- 2.7.4