Merge pull request matplotlib#5359 from mdboom/memleak-fixes

WeatherGod · WeatherGod · commit a450f99a7002 · 2015-10-30T11:26:10.000-04:00
Fix memory leaks found by memleak_hawaii3.py
diff --git a/src/_path.h b/src/_path.h
@@ -1136,7 +1136,6 @@ int convert_to_string(PathIterator &path,
 
     *buffersize = path.total_vertices() * (precision + 5) * 4;
     if (*buffersize == 0) {
-        *buffer = NULL;
         return 0;
     }
 
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -638,8 +638,9 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *
     PyObject *codesobj;
     char *codes[5];
     int postfix;
-    char *buffer;
+    char *buffer = NULL;
     size_t buffersize;
+    PyObject *result;
     int status;
 
     if (!PyArg_ParseTuple(args,
@@ -702,10 +703,14 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *
     }
 
     if (buffersize == 0) {
-        return PyBytes_FromString("");
+        result = PyBytes_FromString("");
     } else {
-        return PyBytes_FromStringAndSize(buffer, buffersize);
+        result = PyBytes_FromStringAndSize(buffer, buffersize);
     }
+
+    free(buffer);
+
+    return result;
 }
 
 extern "C" {
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1032,6 +1032,8 @@ static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args, PyObj
 
     CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));
 
+    PyMem_Free(glyphname);
+
     return PyLong_FromLong(name_index);
 }
 
@@ -1085,6 +1087,8 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
         }
     }
 
+    PyMem_Free(tagname);
+
     void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);
     if (!table) {
         Py_RETURN_NONE;

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,6 @@ int convert_to_string(PathIterator &path,`
`1136`	`1136`
`1137`	`1137`	`buffersize = path.total_vertices() (precision + 5) * 4;`
`1138`	`1138`	`if (*buffersize == 0) {`
`1139`		`- *buffer = NULL;`
`1140`	`1139`	`return 0;`
`1141`	`1140`	`}`
`1142`	`1141`
Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,8 @@ static PyObject PyFT2Font_get_name_index(PyFT2Font self, PyObject *args, PyObj`
`1032`	`1032`
`1033`	`1033`	`CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));`
`1034`	`1034`
	`1035`	`+ PyMem_Free(glyphname);`
	`1036`	`+`
`1035`	`1037`	`return PyLong_FromLong(name_index);`
`1036`	`1038`	`}`
`1037`	`1039`
`@@ -1085,6 +1087,8 @@ static PyObject PyFT2Font_get_sfnt_table(PyFT2Font self, PyObject *args, PyObj`
`1085`	`1087`	`}`
`1086`	`1088`	`}`
`1087`	`1089`
	`1090`	`+ PyMem_Free(tagname);`
	`1091`	`+`
`1088`	`1092`	`void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);`
`1089`	`1093`	`if (!table) {`
`1090`	`1094`	`Py_RETURN_NONE;`