Fix memory management

Author: mdboom

src/bitmap.c

@@ -63,7 +63,7 @@ static void
 Py_Bitmap_dealloc(Py_Bitmap* self)
 {
     FT_Bitmap_Done(get_ft_library(), self->x);
-    free(self->x);
+    Py_TYPE(self)->tp_clear((PyObject*)self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 

src/face.c

@@ -239,6 +239,7 @@ Py_Face_dealloc(Py_Face* self)
     FT_Done_Face(self->x);
     Py_XDECREF(self->filename);
     free(self->mem);
+    Py_TYPE(self)->tp_clear((PyObject*)self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -252,7 +253,8 @@ Py_Face_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (self == NULL) {
         return NULL;
     }
-    self->base.owner = NULL;
+    Py_INCREF(freetypy_module);
+    self->base.owner = freetypy_module;
     self->x = NULL;
     memset(&self->stream, 0, sizeof(FT_StreamRec));
     self->mem = NULL;
@@ -288,6 +290,14 @@ Py_Face_init(Py_Face *self, PyObject *args, PyObject *kwds)
         goto exit;
     }
 
+    if (open_args.stream != NULL) {
+        self->x->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
+    }
+
+    if (ftpy_exc(FT_Set_Char_Size(self->x, 12 * 64, 12 * 64, 72, 72))) {
+        goto exit;
+    }
+
     Py_INCREF(py_file_arg);
     self->filename = py_file_arg;
 
@@ -967,7 +977,7 @@ Py_Face_set_charmap(Py_Face* self, PyObject* args, PyObject* kwds) {
         return NULL;
     }
 
-    if (map > self->x->num_charmaps) {
+    if (map > (unsigned long)self->x->num_charmaps) {
         PyErr_Format(
             PyExc_ValueError,
             "%lu is greater than the number of charmaps in the face (%d)",

src/freetypy.c

@@ -71,6 +71,9 @@ static PyMethodDef module_methods[] = {
 };
 
 
+PyObject *freetypy_module;
+
+
 /* TODO: Hide all exported symbols in the shared library except this one */
 
 #if PY3K
@@ -103,21 +106,19 @@ static PyMethodDef module_methods[] = {
     init_freetypy(void)
 #endif
 {
-    PyObject* m;
-
     if (ftpy_exc(FT_Init_FreeType(&ft_library))) {
        INITERROR;
     }
 
 #if PY3K
-    m = PyModule_Create(&moduledef);
+    freetypy_module = PyModule_Create(&moduledef);
 #else
-    m = Py_InitModule3(
+    freetypy_module = Py_InitModule3(
         "_freetypy", module_methods,
         "Freetype bindings");
 #endif
 
-    if (m == NULL) {
+    if (freetypy_module == NULL) {
         INITERROR;
     }
 
@@ -127,44 +128,45 @@ static PyMethodDef module_methods[] = {
 
         FT_Library_Version(ft_library, &major, &minor, &patch);
         sprintf(version_string, "%d.%d.%d", major, minor, patch);
-        if (PyModule_AddStringConstant(m, "__freetype_version__", version_string)) {
+        if (PyModule_AddStringConstant(
+                freetypy_module, "__freetype_version__", version_string)) {
             INITERROR;
         }
     }
 
-    if (setup_pyutil(m) ||
-        setup_constants(m) ||
-        setup_version(m) ||
+    if (setup_pyutil(freetypy_module) ||
+        setup_constants(freetypy_module) ||
+        setup_version(freetypy_module) ||
         setup_errors() ||
-        setup_BBox(m) ||
-        setup_Bitmap(m) ||
-        setup_Bitmap_Size(m) ||
-        setup_CharIter(m) ||
-        setup_CharMap(m) ||
-        setup_Face(m) ||
-        setup_Glyph(m) ||
-        setup_Glyph_Metrics(m) ||
-        setup_Layout(m) ||
-        setup_Matrix(m) ||
-        setup_Outline(m) ||
-        setup_SfntName(m) ||
-        setup_SfntNames(m) ||
-        setup_Size(m) ||
-        setup_Size_Metrics(m) ||
-        setup_SubGlyph(m) ||
-        setup_SubGlyphs(m) ||
-        setup_TrueType(m) ||
-        setup_TT_Header(m) ||
-        setup_TT_HoriHeader(m) ||
-        setup_TT_OS2(m) ||
-        setup_TT_Pclt(m) ||
-        setup_TT_Postscript(m) ||
-        setup_TT_VertHeader(m) ||
-        setup_Vector(m)
+        setup_BBox(freetypy_module) ||
+        setup_Bitmap(freetypy_module) ||
+        setup_Bitmap_Size(freetypy_module) ||
+        setup_CharIter(freetypy_module) ||
+        setup_CharMap(freetypy_module) ||
+        setup_Face(freetypy_module) ||
+        setup_Glyph(freetypy_module) ||
+        setup_Glyph_Metrics(freetypy_module) ||
+        setup_Layout(freetypy_module) ||
+        setup_Matrix(freetypy_module) ||
+        setup_Outline(freetypy_module) ||
+        setup_SfntName(freetypy_module) ||
+        setup_SfntNames(freetypy_module) ||
+        setup_Size(freetypy_module) ||
+        setup_Size_Metrics(freetypy_module) ||
+        setup_SubGlyph(freetypy_module) ||
+        setup_SubGlyphs(freetypy_module) ||
+        setup_TrueType(freetypy_module) ||
+        setup_TT_Header(freetypy_module) ||
+        setup_TT_HoriHeader(freetypy_module) ||
+        setup_TT_OS2(freetypy_module) ||
+        setup_TT_Pclt(freetypy_module) ||
+        setup_TT_Postscript(freetypy_module) ||
+        setup_TT_VertHeader(freetypy_module) ||
+        setup_Vector(freetypy_module)
         )
         INITERROR;
 
     #if PY3K
-    return m;
+    return freetypy_module;
     #endif
 }

src/freetypy.h

@@ -50,6 +50,9 @@ either expressed or implied, of the FreeBSD Project.
 FT_Library get_ft_library(void);
 
 
+extern PyObject *freetypy_module;
+
+
 #include "freetypy_error.h"
 #include "pyutil.h"
 

src/glyph.c

@@ -60,9 +60,11 @@ static PyTypeObject Py_Glyph_Type;
 static void
 Py_Glyph_dealloc(Py_Glyph* self)
 {
-    Py_TYPE(self)->tp_clear((PyObject *)self);
     free(self->x);
-    FT_Done_Glyph(self->glyph);
+    if (self->glyph) {
+        FT_Done_Glyph(self->glyph);
+    }
+    Py_TYPE(self)->tp_clear((PyObject*)self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -83,16 +85,26 @@ Py_Glyph_cnew(FT_GlyphSlot glyph_slot, PyObject *owner, int load_flags)
         return NULL;
     }
 
+    self->x = NULL;
+    self->glyph = NULL;
+
     glyph_slot_copy = PyMem_Malloc(sizeof(FT_GlyphSlotRec));
     if (glyph_slot_copy == NULL) {
         Py_DECREF(self);
         return NULL;
     }
     memcpy(glyph_slot_copy, glyph_slot, sizeof(FT_GlyphSlotRec));
     self->x = glyph_slot_copy;
-    self->glyph = glyph;
+
+    if (ftpy_exc(FT_Glyph_Copy(glyph, &self->glyph))) {
+        Py_DECREF(self);
+        return NULL;
+    }
+    FT_Done_Glyph(glyph);
+
     Py_INCREF(owner);
     self->base.owner = owner;
+
     return (PyObject *)self;
 }
 
@@ -107,6 +119,7 @@ Py_Glyph_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     }
     self->x = NULL;
+    self->glyph = NULL;
     return (PyObject *)self;
 }
 

src/outline.c

@@ -353,6 +353,7 @@ Py_Outline_to_string_cubicto_func(
 typedef struct {
     ftpy_Object base;
     FT_Outline x;
+    int inited;
 } Py_Outline;
 
 
@@ -370,7 +371,10 @@ static PyObject *Py_Outline_Contours_Buffer_cnew(PyObject *owner);
 static void
 Py_Outline_dealloc(Py_Outline* self)
 {
-    FT_Outline_Done(get_ft_library(), &self->x);
+    if (self->inited) {
+        FT_Outline_Done(get_ft_library(), &self->x);
+    }
+    Py_TYPE(self)->tp_clear((PyObject*)self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -385,6 +389,8 @@ Py_Outline_cnew(FT_Outline *outline)
         return NULL;
     }
 
+    self->inited = 0;
+
     if (ftpy_exc(
             FT_Outline_New(get_ft_library(),
                            outline->n_points,
@@ -394,9 +400,10 @@ Py_Outline_cnew(FT_Outline *outline)
         return NULL;
     }
 
+    self->inited = 1;
+
     if (ftpy_exc(
             FT_Outline_Copy(outline, &self->x))) {
-        FT_Outline_Done(get_ft_library(), &self->x);
         Py_DECREF(self);
         return NULL;
     }
@@ -411,6 +418,7 @@ Py_Outline_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     Py_Outline *self;
     self = (Py_Outline *)type->tp_alloc(type, 0);
+    self->inited = 0;
     return (PyObject *)self;
 }
 

src/pyutil.c

@@ -54,13 +54,7 @@ static const char *qualified_name_to_name(const char *qualified_name)
 static int
 generic_traverse(ftpy_Object *self, visitproc visit, void *arg)
 {
-    int vret;
-
-    if (self->owner) {
-        vret = visit(self->owner, arg);
-        if (vret != 0)
-            return vret;
-    }
+    Py_VISIT(self->owner);
 
     return 0;
 }
@@ -81,7 +75,7 @@ generic_clear(ftpy_Object *self)
 
 void ftpy_Object_dealloc(PyObject* self)
 {
-    generic_clear((ftpy_Object *)self);
+    Py_TYPE(self)->tp_clear((PyObject*)self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }