python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-10-29 23:17:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6329 from nulano/imagetk-leak

Browse Source 
Inline fname2char to fix memory leak
This commit is contained in:
Hugo van Kemenade 2022-10-29 10:59:54 +03:00 committed by GitHub
commit 327db9a545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Tk/tkImaging.c
View File

@ -364,17 +364,6 @@ load_tkinter_funcs(void) {
* tkinter dynamic library (module). * tkinter dynamic library (module).
*/ */
/* From module __file__ attribute to char *string for dlopen. */
char *
fname2char(PyObject *fname) {
PyObject *bytes;
bytes = PyUnicode_EncodeFSDefault(fname);
if (bytes == NULL) {
return NULL;
}
return PyBytes_AsString(bytes);
}
#include <dlfcn.h> #include <dlfcn.h>
void * void *
@ -442,7 +431,7 @@ load_tkinter_funcs(void) {
int ret = -1; int ret = -1;
void *main_program, *tkinter_lib; void *main_program, *tkinter_lib;
char *tkinter_libname; char *tkinter_libname;
PyObject *pModule = NULL, *pString = NULL; PyObject *pModule = NULL, *pString = NULL, *pBytes = NULL;
/* Try loading from the main program namespace first */ /* Try loading from the main program namespace first */
main_program = dlopen(NULL, RTLD_LAZY); main_program = dlopen(NULL, RTLD_LAZY);
@ -462,7 +451,12 @@ load_tkinter_funcs(void) {
if (pString == NULL) { if (pString == NULL) {
goto exit; goto exit;
} }
tkinter_libname = fname2char(pString); /* From module __file__ attribute to char *string for dlopen. */
pBytes = PyUnicode_EncodeFSDefault(pString);
if (pBytes == NULL) {
goto exit;
}
tkinter_libname = PyBytes_AsString(pBytes);
if (tkinter_libname == NULL) { if (tkinter_libname == NULL) {
goto exit; goto exit;
} }
@ -478,6 +472,7 @@ exit:
dlclose(main_program); dlclose(main_program);
Py_XDECREF(pModule); Py_XDECREF(pModule);
Py_XDECREF(pString); Py_XDECREF(pString);
Py_XDECREF(pBytes);
return ret; return ret;
} }
#endif /* end not Windows */ #endif /* end not Windows */