Skip to content

Fix memory leaks found by memleak_hawaii3.py #5359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2015
Merged

Fix memory leaks found by memleak_hawaii3.py #5359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/_path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,6 @@ int convert_to_string(PathIterator &path,

*buffersize = path.total_vertices() * (precision + 5) * 4;
if (*buffersize == 0) {
*buffer = NULL;
return 0;
}

Expand Down
11 changes: 8 additions & 3 deletions src/_path_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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" {
Expand Down
4 changes: 4 additions & 0 deletions src/ft2font_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down