diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 14:26:56 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 17:58:07 +0900 |
| commit | 3d2551175df2010032b512738f8346bd191d6587 (patch) | |
| tree | f8cd4545fd7e3a837e68f9f262517432e1cd4405 | |
| parent | f3c9d25c1f9b0172194fa0c451620b633aa75513 (diff) | |
| download | efl-3d2551175df2010032b512738f8346bd191d6587.tar.gz | |
evas: Fix shutdown of async cmd cache
The incomplete reset (array to NULL but max not reset) triggers errors
in evas_thread_queue_append() where eina_inarray_grow() returns NULL.
This shows up in:
CK_FORK=no elm_suite
@fix
| -rw-r--r-- | src/lib/evas/canvas/evas_async_events.c | 1 | ||||
| -rw-r--r-- | src/lib/evas/common/evas_thread_render.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c index a903644772..58f26fb52e 100644 --- a/src/lib/evas/canvas/evas_async_events.c +++ b/src/lib/evas/canvas/evas_async_events.c @@ -158,6 +158,7 @@ evas_async_events_shutdown(void) free(async_queue_cache); async_queue_cache = NULL; + async_queue_cache_max = 0; eina_spinlock_free(&async_lock); eina_inarray_flush(&async_queue); diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c index bbde81a657..84ea7b4234 100644 --- a/src/lib/evas/common/evas_thread_render.c +++ b/src/lib/evas/common/evas_thread_render.c @@ -270,6 +270,7 @@ timeout_shutdown: free(evas_thread_queue_cache); evas_thread_queue_cache = NULL; + evas_thread_queue_cache_max = 0; eina_inarray_flush(&evas_thread_queue); eina_threads_shutdown(); |