jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1360: Leak of SWIG var link object

Browse source
This commit is contained in:
Andrew Rogers 2018-11-23 16:02:46 +00:00
commit 65edf2258f
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.current
View file

@ -7,6 +7,11 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.0.0 (in progress) Version 4.0.0 (in progress)
=========================== ===========================
2018-11-23: adr26
[Python] #1360 Leak of SWIG var link object
Fix reference counting on _SWIG_globals to allow var link to be freed on module unload.
2018-11-22: rupertnash 2018-11-22: rupertnash
[Python] #1282 Make generated module runnable via python -m (PEP 366 conforming) [Python] #1282 Make generated module runnable via python -m (PEP 366 conforming)

8
Lib/python/pyinit.swg
View file

@ -227,7 +227,11 @@ SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void
SWIGINTERN PyObject * SWIGINTERN PyObject *
SWIG_globals(void) { SWIG_globals(void) {
static PyObject *_SWIG_globals = 0; static PyObject *_SWIG_globals = 0;
if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink(); if (!_SWIG_globals) {
_SWIG_globals = SWIG_newvarlink();
} else {
Py_INCREF(_SWIG_globals);
}
return _SWIG_globals; return _SWIG_globals;
} }
@ -326,7 +330,7 @@ SWIGEXPORT
void void
#endif #endif
SWIG_init(void) { SWIG_init(void) {
PyObject *m, *d, *md; PyObject *m, *d, *md, *globals;
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
static struct PyModuleDef SWIG_module = { static struct PyModuleDef SWIG_module = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,

15
Source/Modules/python.cxx
View file

@ -3320,11 +3320,21 @@ public:
getf = NewWrapper(); getf = NewWrapper();
setf = NewWrapper(); setf = NewWrapper();
Printf(f_init, "\t globals = SWIG_globals();\n");
Printf(f_init, "\t if (!globals) {\n");
Printf(f_init, " PyErr_SetString(PyExc_TypeError, \"Failure to create SWIG globals.\");\n");
Printf(f_init, "#if PY_VERSION_HEX >= 0x03000000\n");
Printf(f_init, "\t return NULL;\n");
Printf(f_init, "#else\n");
Printf(f_init, "\t return;\n");
Printf(f_init, "#endif\n");
Printf(f_init, "\t }\n");
/* If this is our first call, add the globals variable to the /* If this is our first call, add the globals variable to the
Python dictionary. */ Python dictionary. */
if (!have_globals) { if (!have_globals) {
Printf(f_init, "\t PyDict_SetItemString(md, \"%s\", SWIG_globals());\n", global_name); Printf(f_init, "\t PyDict_SetItemString(md, \"%s\", globals);\n", global_name);
if (builtin) if (builtin)
Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", global_name); Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", global_name);
have_globals = 1; have_globals = 1;
@ -3412,11 +3422,12 @@ public:
Wrapper_print(getf, f_wrappers); Wrapper_print(getf, f_wrappers);
/* Now add this to the variable linking mechanism */ /* Now add this to the variable linking mechanism */
Printf(f_init, "\t SWIG_addvarlink(SWIG_globals(), \"%s\", %s, %s);\n", iname, vargetname, varsetname); Printf(f_init, "\t SWIG_addvarlink(globals,\"%s\",%s, %s);\n", iname, vargetname, varsetname);
if (builtin && shadow && !assignable && !in_class) { if (builtin && shadow && !assignable && !in_class) {
Printf(f_init, "\t PyDict_SetItemString(md, \"%s\", PyObject_GetAttrString(SWIG_globals(), \"%s\"));\n", iname, iname); Printf(f_init, "\t PyDict_SetItemString(md, \"%s\", PyObject_GetAttrString(SWIG_globals(), \"%s\"));\n", iname, iname);
Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", iname); Printf(f_init, "\t SwigPyBuiltin_AddPublicSymbol(public_interface, \"%s\");\n", iname);
} }
Printf(f_init, "\t Py_DECREF(globals);\n");
Delete(vargetname); Delete(vargetname);
Delete(varsetname); Delete(varsetname);
Delete(getname); Delete(getname);