python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-24 16:24:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4160 from cgohlke/patch-1

Browse Source 
Fix segfault: do not destroy glyph while its bitmap is used
This commit is contained in:
Andrew Murray 2019-11-02 13:32:33 +11:00 committed by GitHub
commit b0eb5e18b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_imagingft.c
View File

@ -890,8 +890,6 @@ font_render(FontObject* self, PyObject* args)
bitmap = bitmap_glyph->bitmap; bitmap = bitmap_glyph->bitmap;
left = bitmap_glyph->left; left = bitmap_glyph->left;
FT_Done_Glyph(glyph);
} else { } else {
bitmap = glyph_slot->bitmap; bitmap = glyph_slot->bitmap;
left = glyph_slot->bitmap_left; left = glyph_slot->bitmap_left;
@ -953,6 +951,9 @@ font_render(FontObject* self, PyObject* args)
} }
x += glyph_info[i].x_advance; x += glyph_info[i].x_advance;
y -= glyph_info[i].y_advance; y -= glyph_info[i].y_advance;
if (stroker != NULL) {
FT_Done_Glyph(glyph);
}
} }
FT_Stroker_Done(stroker); FT_Stroker_Done(stroker);