Commit 8336d53cff9f78bb48f1ba4aa670c1d8d81d1808
2021-06-12T22:33:08
[type42] Fix new memory leak. We need to inverse inheritance of FT_GlyphSlot_Internal so that we have a chance to free the rendered bitmap from the parent slot. * src/type42/t42objs.c (T42_GlyphSlot_Init): Remove the internal parts of the child `ttslot' and replace it with the parent structure. (T42_GlyphSlot_Done): Updated accordingly.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/ChangeLog b/ChangeLog
index 07c9a78..80878ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-06-12 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [type42] Fix new memory leak.
+
+ We need to inverse inheritance of FT_GlyphSlot_Internal so that we
+ have a chance to free the rendered bitmap from the parent slot.
+
+ * src/type42/t42objs.c (T42_GlyphSlot_Init): Remove the internal parts
+ of the child `ttslot' and replace it with the parent structure.
+ (T42_GlyphSlot_Done): Updated accordingly.
+
2021-06-12 Werner Lemberg <wl@gnu.org>
[psaux] Fix another assertion.
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index dd23e73..c32dc5b 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -600,9 +600,9 @@
}
/* share the loader so that the autohinter can see it */
- FT_GlyphLoader_Done( t42slot->internal->loader );
- FT_FREE( t42slot->internal );
- t42slot->internal = slot->ttslot->internal;
+ FT_GlyphLoader_Done( slot->ttslot->internal->loader );
+ FT_FREE( slot->ttslot->internal );
+ slot->ttslot->internal = t42slot->internal;
return error;
}
@@ -614,8 +614,8 @@
T42_GlyphSlot slot = (T42_GlyphSlot)t42slot;
+ slot->ttslot->internal = NULL;
FT_Done_GlyphSlot( slot->ttslot );
- t42slot->internal = NULL;
}