From: Øyvind Kolås <pippin@gimp.org>
Date: Wed, 9 Feb 2022 19:03:46 +0000 (+0100)
Subject: babl: fix mutex lock/unlocks symmetry in babl_fish()
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~4^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbad95a756467f8ccc07d6d00bfff8d689e0c1c9;p=babl.git

babl: fix mutex lock/unlocks symmetry in babl_fish()

In the case where the fish we are to look up is the memcpy fish we were
not locking the mutex. Whereas the common cleanup after the branches
assumes the lock is held. This is probably the cause of gimp#7632.
---

diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index aece33b..06d7961 100644
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -253,6 +253,7 @@ babl_fish (const void *source,
          * we will search through the fish database for reference fish
          * to handle the memcpy */
         babl_hash_table_find (id_htable, hashval, find_memcpy_fish, (void *) &ffish);
+        babl_mutex_lock (babl_fish_mutex);
       }
     else
       {