com php-src: Dont ignore errors from FT_Get_Glyph: ext/ gd/libgd/gdft.c
| From: | Paul Tarjan | Date: | Tue, 14 Jan 2014 00:30:48 +0000 |
| Subject: | com php-src: Dont ignore errors from FT_Get_Glyph: ext/ gd/libgd/gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75608@lists.php.net to get a copy of this message | ||
Commit: d599d36d49fb51cc0b373493ef2ebdab34699c4c
Author: Paul Tarjan <ptarjan@php.net> Mon, 13 Jan 2014 16:30:48 -0800
Parents: bbc37e78e84633ed697904e6025a5ba262af057d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d599d36d49fb51cc0b373493ef2ebdab34699c4c
Log:
Dont ignore errors from FT_Get_Glyph
Changed paths:
M ext/gd/libgd/gdft.c
Diff:
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index ac2bf34..aa8e8d3 100644
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -1050,7 +1050,15 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double
ptsi
}
/* transform glyph image */
- FT_Get_Glyph(slot, &image);
+ if (FT_Get_Glyph(slot, &image)) {
+ if (tmpstr) {
+ gdFree(tmpstr);
+ }
+ gdCacheDelete(tc_cache);
+ gdMutexUnlock(gdFontCacheMutex);
+ return "Problem loading glyph";
+ }
+
if (brect) { /* only if need brect */
FT_Glyph_Get_CBox(image, ft_glyph_bbox_gridfit, &glyph_bbox);
glyph_bbox.xMin += penf.x;