- MFB: #40578, fix the 2nd race condition on shutdown when the cache is

  freed

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index bf5bd04d12e6b56a2868de6f3304013ece09daa2..25974528af8d028da5fd9ae388636400777a5375 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -718,9 +718,10 @@ gdroundupdown (FT_F26Dot6 v1, int updown)
 void gdFontCacheShutdown()
 {
        if (fontCache) {
-               gdMutexShutdown(gdFontCacheMutex);
+               gdMutexLock(gdFontCacheMutex);
                gdCacheDelete(fontCache);
                fontCache = NULL;
+               gdMutexShutdown(gdFontCacheMutex);
                FT_Done_FreeType(library);
        }
 }