cvs: php4(PHP_4_3) /ext/gd/libgd gdft.c
| From: | Rasmus Lerdorf | Date: | Wed, 30 Apr 2003 16:24:00 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/gd/libgd gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20611@lists.php.net to get a copy of this message | ||
rasmus Wed Apr 30 12:24:00 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gdft.c
Log:
Fix gdCacheDelete() crashes in the bundled gd library
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.11.2.7 php4/ext/gd/libgd/gdft.c:1.11.2.8
--- php4/ext/gd/libgd/gdft.c:1.11.2.7 Sat Apr 5 12:24:16 2003
+++ php4/ext/gd/libgd/gdft.c Wed Apr 30 12:23:59 2003
@@ -744,7 +744,7 @@
/* Persistent font cache until explicitly cleared */
/* Fonts can be used across multiple images */
-static gdCache_head_t *fontCache;
+static gdCache_head_t *fontCache = NULL;
static FT_Library library;
void
@@ -753,6 +753,7 @@
if (fontCache)
{
gdCacheDelete(fontCache);
+ fontCache=NULL;
FT_Done_FreeType(library);
}
}