tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Freeing languages in Python

Browse Source
This commit is contained in:
Al
2015-12-31 01:46:04 -05:00
parent cc89b768d8
commit 7bd1336b3b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/postal/pyexpand.c
View File

@@ -138,12 +138,12 @@ static PyObject *py_expand(PyObject *self, PyObject *args, PyObject *keywords) {
} }
char **languages = NULL; char **languages = NULL;
size_t num_languages = 0;
if (PySequence_Check(arg_languages)) { if (PySequence_Check(arg_languages)) {
PyObject *seq = PySequence_Fast(arg_languages, "Expected a sequence"); PyObject *seq = PySequence_Fast(arg_languages, "Expected a sequence");
Py_ssize_t len_languages = PySequence_Length(arg_languages); Py_ssize_t len_languages = PySequence_Length(arg_languages);
size_t num_languages = 0;
if (len_languages > 0) { if (len_languages > 0) {
languages = malloc(len_languages * sizeof(char *)); languages = malloc(len_languages * sizeof(char *));
if (languages == NULL) { if (languages == NULL) {
@@ -186,10 +186,13 @@ static PyObject *py_expand(PyObject *self, PyObject *args, PyObject *keywords) {
if (num_languages > 0) { if (num_languages > 0) {
options.languages = languages; options.languages = languages;
options.num_languages = (int)num_languages;
} else {
free(languages);
languages = NULL;
} }
} }
options.num_languages = num_languages;
Py_DECREF(seq); Py_DECREF(seq);
} }
@@ -204,6 +207,9 @@ static PyObject *py_expand(PyObject *self, PyObject *args, PyObject *keywords) {
char **expansions = expand_address(input, options, &num_expansions); char **expansions = expand_address(input, options, &num_expansions);
if (languages != NULL) { if (languages != NULL) {
for (int i = 0; i < num_languages; i++) {
free(languages[i]);
}
free(languages); free(languages);
} }