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

pierrejoye · pierrejoye · commit 7d437feb8302 · 2007-02-23T01:02:57.000Z
freed
diff --git 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);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -718,9 +718,10 @@ gdroundupdown (FT_F26Dot6 v1, int updown)`
`718`	`718`	`void gdFontCacheShutdown()`
`719`	`719`	`{`
`720`	`720`	`if (fontCache) {`
`721`		`- gdMutexShutdown(gdFontCacheMutex);`
	`721`	`+ gdMutexLock(gdFontCacheMutex);`
`722`	`722`	`gdCacheDelete(fontCache);`
`723`	`723`	`fontCache = NULL;`
	`724`	`+ gdMutexShutdown(gdFontCacheMutex);`
`724`	`725`	`FT_Done_FreeType(library);`
`725`	`726`	`}`
`726`	`727`	`}`