diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-12-27 19:24:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-12-27 19:24:39 +0300 |
| commit | 2b226d95786fd5e8dd846ffbe990c3e1bb1fd35e (patch) | |
| tree | f1c84b669fe7203d3296534a2210368cd24d8d59 /source/blender/python/intern/bpy_app_translations.c | |
| parent | 155bb058f4e03a108b06f150b57e273e62d4f339 (diff) | |
Fix a very stupid memleak in own bpy_app_translations.c code...
Safe for 2.73.
Diffstat (limited to 'source/blender/python/intern/bpy_app_translations.c')
| -rw-r--r-- | source/blender/python/intern/bpy_app_translations.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 6d0161c2047..2135abdd589 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -241,12 +241,9 @@ static void _build_translations_cache(PyObject *py_messages, const char *locale) } /* Clean up! */ - if (language) - MEM_freeN(language); - if (language_country) - MEM_freeN(language_country); - if (language_variant) - MEM_freeN(language_variant); + MEM_SAFE_FREE(language); + MEM_SAFE_FREE(language_country); + MEM_SAFE_FREE(language_variant); } const char *BPY_app_translations_py_pgettext(const char *msgctxt, const char *msgid) @@ -631,6 +628,7 @@ PyDoc_STRVAR(app_translations_locale_explode_doc, ); static PyObject *app_translations_locale_explode(BlenderAppTranslations *UNUSED(self), PyObject *args, PyObject *kw) { + PyObject *ret_tuple; static const char *kwlist[] = {"locale", NULL}; const char *locale; char *language, *country, *variant, *language_country, *language_variant; @@ -641,7 +639,15 @@ static PyObject *app_translations_locale_explode(BlenderAppTranslations *UNUSED( BLF_locale_explode(locale, &language, &country, &variant, &language_country, &language_variant); - return Py_BuildValue("sssss", language, country, variant, language_country, language_variant); + ret_tuple = Py_BuildValue("sssss", language, country, variant, language_country, language_variant); + + MEM_SAFE_FREE(language); + MEM_SAFE_FREE(country); + MEM_SAFE_FREE(variant); + MEM_SAFE_FREE(language_country); + MEM_SAFE_FREE(language_variant); + + return ret_tuple; } static PyMethodDef app_translations_methods[] = { |