From 469cf26873403f0453841ff9902d7d8b73cdc434 Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Tue, 23 Aug 2016 16:51:54 +0200 Subject: [PATCH] evas: handle thread queue creation failure eina_thread_queue_create() might fail. Actually it does fail on Mac OS X under some circumstances. --- src/lib/evas/common/evas_scale_sample.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c index 61f071f1de..008e43dea2 100644 --- a/src/lib/evas/common/evas_scale_sample.c +++ b/src/lib/evas/common/evas_scale_sample.c @@ -871,15 +871,30 @@ evas_common_scale_sample_init(void) if (eina_cpu_count() <= 2) return ; thread_queue = eina_thread_queue_new(); + if (EINA_UNLIKELY(!thread_queue)) + { + ERR("Failed to create thread queue"); + goto cleanup; + } main_queue = eina_thread_queue_new(); + if (EINA_UNLIKELY(!thread_queue)) + { + ERR("Failed to create thread queue"); + goto cleanup; + } if (!eina_thread_create(&scaling_thread, EINA_THREAD_NORMAL, -1, _evas_common_scale_sample_thread, NULL)) { - return; + goto cleanup; } use_thread = EINA_TRUE; + return; + +cleanup: + if (thread_queue) eina_thread_queue_free(thread_queue); + if (main_queue) eina_thread_queue_free(main_queue); } EAPI void