From 1f1b36a9e2ff61ebdeab182f603159a31fea4e25 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 28 Nov 2014 14:20:06 +0100 Subject: [PATCH] imagecache: fix global mutex deadlock --- src/imagecache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imagecache.c b/src/imagecache.c index 0462474d..26db0ac0 100644 --- a/src/imagecache.c +++ b/src/imagecache.c @@ -144,6 +144,8 @@ imagecache_image_fetch ( imagecache_image_t *img ) tvhpoll_t *efd = NULL; http_client_t *hc; + lock_assert(&global_lock); + if (img->url == NULL || img->url[0] == '\0') return res; @@ -575,9 +577,7 @@ imagecache_open ( uint32_t id ) } else if (i->state == QUEUED) { i->state = FETCHING; TAILQ_REMOVE(&imagecache_queue, i, q_link); - pthread_mutex_unlock(&global_lock); e = imagecache_image_fetch(i); - pthread_mutex_lock(&global_lock); if (e) return -1; }