summaryrefslogtreecommitdiff
path: root/ext/gd/libgd/gdft.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2007-02-23 01:02:57 +0000
committerPierre Joye <pajoye@php.net>2007-02-23 01:02:57 +0000
commit7d437feb83026cbd60b540f8544dc1941741a4ab (patch)
treecd4001f4ed67a1d81397e558981a09d763d13391 /ext/gd/libgd/gdft.c
parent65b54baac41e25492dcc3d4e35871bbb9c3755fa (diff)
downloadphp-git-7d437feb83026cbd60b540f8544dc1941741a4ab.tar.gz
- MFB: #40578, fix the 2nd race condition on shutdown when the cache is
freed
Diffstat (limited to 'ext/gd/libgd/gdft.c')
-rw-r--r--ext/gd/libgd/gdft.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index bf5bd04d12..25974528af 100644
--- 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);
}
}