Fix memory management revealed by using static freetype

mdboom · mdboom · commit d102d39d56c4 · 2015-11-05T11:42:22.000-05:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -511,6 +511,10 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(
         throw "Could not set the fontsize";
     }
 
+    if (open_args.stream != NULL) {
+        face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
+    }
+
     static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
     FT_Set_Transform(face, &transform, 0);
 }
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -463,11 +463,14 @@ static PyObject *PyFT2Font_new(PyTypeObject *type, PyObject *args, PyObject *kwd
     PyFT2Font *self;
     self = (PyFT2Font *)type->tp_alloc(type, 0);
     self->x = NULL;
+    self->fname = NULL;
     self->py_file = NULL;
     self->fp = NULL;
     self->close_file = 0;
     self->offset = 0;
     memset(&self->stream, 0, sizeof(FT_StreamRec));
+    self->mem = 0;
+    self->mem_size = 0;
     return (PyObject *)self;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -511,6 +511,10 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(`
`511`	`511`	`throw "Could not set the fontsize";`
`512`	`512`	`}`
`513`	`513`
	`514`	`+ if (open_args.stream != NULL) {`
	`515`	`+ face->face_flags \|= FT_FACE_FLAG_EXTERNAL_STREAM;`
	`516`	`+ }`
	`517`	`+`
`514`	`518`	`static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };`
`515`	`519`	`FT_Set_Transform(face, &transform, 0);`
`516`	`520`	`}`