From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 28 Nov 2014 13:20:06 +0000 (+0100)
Subject: imagecache: fix global mutex deadlock
X-Git-Tag: v4.1~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f1b36a9e2ff61ebdeab182f603159a31fea4e25;p=thirdparty%2Ftvheadend.git

imagecache: fix global mutex deadlock
---

diff --git a/src/imagecache.c b/src/imagecache.c
index 0462474d8..26db0ac0a 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;
     }