Merge pull request #4160 from cgohlke/patch-1

Fix segfault: do not destroy glyph while its bitmap is used
python-pillow · Nov 2, 2019 · b0eb5e1 · b0eb5e1
2 parents 64e1fee + a2225ae
commit b0eb5e1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/_imagingft.c b/src/_imagingft.c
@@ -890,8 +890,6 @@ font_render(FontObject* self, PyObject* args)
 
             bitmap = bitmap_glyph->bitmap;
             left = bitmap_glyph->left;
-
-            FT_Done_Glyph(glyph);
         } else {
             bitmap = glyph_slot->bitmap;
             left = glyph_slot->bitmap_left;
@@ -953,6 +951,9 @@ font_render(FontObject* self, PyObject* args)
         }
         x += glyph_info[i].x_advance;
         y -= glyph_info[i].y_advance;
+        if (stroker != NULL) {
+            FT_Done_Glyph(glyph);
+        }
     }
 
     FT_Stroker_Done(stroker);