Fix memory leaks in ttconv (that manifest themselves in the PDF and PS backends).

mdboom · mdboom · commit ca5a47bb6d7b · 2008-07-31T15:37:56.000Z
svn path=/trunk/matplotlib/; revision=5937
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -25,22 +25,23 @@ class PythonFileWriter : public TTStreamWriter {
   }
 
   ~PythonFileWriter() {
-    if (_write_method)
-      Py_DECREF(_write_method);
+    Py_XDECREF(_write_method);
   }
 
   void set(PyObject* write_method) {
-    if (_write_method)
-      Py_DECREF(_write_method);
+    Py_XDECREF(_write_method);
     _write_method = write_method;
-    if (_write_method)
-      Py_INCREF(_write_method);
+    Py_XINCREF(_write_method);
   }
 
   virtual void write(const char* a) {
-    if (_write_method)
-      if (! PyObject_CallFunction(_write_method, (char *)"s", a))
+    PyObject* result = NULL;
+    if (_write_method) {
+      result = PyObject_CallFunction(_write_method, (char *)"s", a);
+      if (! result)
 	throw PythonExceptionOccurred();
+      Py_DECREF(result);
+    }
   }
 };
 
@@ -54,6 +55,7 @@ int fileobject_to_PythonFileWriter(PyObject* object, void* address) {
   }
 
   file_writer->set(write_method);
+  Py_DECREF(write_method);
 
   return 1;
 }
@@ -68,11 +70,14 @@ int pyiterable_to_vector_int(PyObject* object, void* address) {
   PyObject* item;
   while ( (item = PyIter_Next(iterator)) ) {
     long value = PyInt_AsLong(item);
+    Py_DECREF(item);
     if (value == -1 && PyErr_Occurred())
       return 0;
     result->push_back(value);
   }
 
+  Py_DECREF(iterator);
+
   return 1;
 }
 
@@ -130,9 +135,13 @@ class PythonDictionaryCallback : public TTDictionaryCallback {
 
   virtual void add_pair(const char* a, const char* b) {
     PyObject* value = PyString_FromString(b);
-    if (value)
-      if (PyDict_SetItemString(_dict, a, value))
+    if (value) {
+      if (PyDict_SetItemString(_dict, a, value)) {
+        Py_DECREF(value);
 	throw PythonExceptionOccurred();
+      }
+    }
+    Py_DECREF(value);
   }
 };
 
@@ -145,7 +154,7 @@ py_get_pdf_charprocs(PyObject* self, PyObject* args, PyObject* kwds) {
   static const char *kwlist[] = { "filename", "glyph_ids", NULL };
   if (! PyArg_ParseTupleAndKeywords
       (args, kwds,
-       "s|O&:convert_ttf_to_ps",
+       "s|O&:get_pdf_charprocs",
        (char **)kwlist,
        &filename,
        pyiterable_to_vector_int,
@@ -161,11 +170,14 @@ py_get_pdf_charprocs(PyObject* self, PyObject* args, PyObject* kwds) {
   try {
     ::get_pdf_charprocs( filename, glyph_ids, dict );
   } catch (TTException& e) {
+    Py_DECREF(result);
     PyErr_SetString(PyExc_RuntimeError, e.getMessage());
     return NULL;
   } catch (PythonExceptionOccurred& ) {
+    Py_DECREF(result);
     return NULL;
   } catch (...) {
+    Py_DECREF(result);
     PyErr_SetString(PyExc_RuntimeError, "Unknown C++ exception");
     return NULL;
   }
