Dont ignore errors from FT_Get_Glyph

"image" is left uninitialized if we do. Reviewed By: @scannell Differential Revision: D1126277
facebook · Jan 14, 2014 · 7eb3262 · 7eb3262
1 parent 42795f0
commit 7eb3262
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/hphp/runtime/ext/gd/libgd/gdft.cpp b/hphp/runtime/ext/gd/libgd/gdft.cpp
@@ -1050,7 +1050,14 @@ 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;