MFB: fix race condition on font cache shutdown

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 414f5e28ebbace5d469e1b952bb73fd5295dbe0d..5ddddcea5e9c9873ce6b533c6ce646da36e6a4fe 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -715,13 +715,15 @@ gdroundupdown (FT_F26Dot6 v1, int updown)
 
 void gdFontCacheShutdown()
 {
+       gdMutexLock(gdFontCacheMutex);
+
        if (fontCache) {
-               gdMutexLock(gdFontCacheMutex);
                gdCacheDelete(fontCache);
                fontCache = NULL;
-               gdMutexUnlock(gdFontCacheMutex);
                FT_Done_FreeType(library);
        }
+
+       gdMutexUnlock(gdFontCacheMutex);
 }
 
 void gdFreeFontCache()