From 6d355b82b81575d45639d041f598b593ee8daa01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Oct 2012 16:11:24 +0530
Subject: [PATCH] Fix a potential crash in the FreeType bindings, if the string
 object passed in from python is deleted before the face oject.

---
 src/calibre/utils/fonts/freetype.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/calibre/utils/fonts/freetype.cpp b/src/calibre/utils/fonts/freetype.cpp
index e4e30000a0..9086ae0377 100644
--- a/src/calibre/utils/fonts/freetype.cpp
+++ b/src/calibre/utils/fonts/freetype.cpp
@@ -22,6 +22,7 @@ typedef struct {
     // ensure it is garbage collected before the library object, to prevent
     // segfaults.
     PyObject *library;
+    PyObject *data;
 } Face;
 
 typedef struct {
@@ -40,9 +41,12 @@ Face_dealloc(Face* self)
     }
     self->face = NULL;
 
-    Py_DECREF(self->library);
+    Py_XDECREF(self->library);
     self->library = NULL;
 
+    Py_XDECREF(self->data);
+    self->data = NULL;
+
     self->ob_type->tp_free((PyObject*)self);
 }
 
@@ -55,8 +59,6 @@ Face_init(Face *self, PyObject *args, PyObject *kwds)
     PyObject *ft;
 
     if (!PyArg_ParseTuple(args, "Os#", &ft, &data, &sz)) return -1;
-    self->library = ft;
-    Py_XINCREF(ft);
 
     Py_BEGIN_ALLOW_THREADS;
     error = FT_New_Memory_Face( ( (FreeType*)ft )->library,
@@ -70,6 +72,10 @@ Face_init(Face *self, PyObject *args, PyObject *kwds)
             PyErr_Format(FreeTypeError, "Failed to initialize the Font with error: 0x%x", error);
         return -1;
     }
+    self->library = ft;
+    Py_XINCREF(ft);
+
+    self->data = PySequence_GetItem(args, 1);
     return 0;
 }