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

[Python] Add missing locks to std::map wrappers. Patch from

Browse source 
Paul Hampson in SF#2813836.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11465 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-07-29 03:34:22 +00:00
commit 0d539c8048
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.40 (in progress) Version 1.3.40 (in progress)
============================ ============================
2009-07-29: olly
[Python] Add missing locks to std::map wrappers. Patch from
Paul Hampson in SF#2813836.
2009-07-29: olly 2009-07-29: olly
[PHP] Fix memory leak in PHP OUTPUT typemaps. Reported by Hitoshi [PHP] Fix memory leak in PHP OUTPUT typemaps. Reported by Hitoshi
Amano in SF#2826322. Amano in SF#2826322.

14
Lib/python/std_map.i
View file

@ -20,6 +20,7 @@
typedef std::map<K,T> map_type; typedef std::map<K,T> map_type;
static int asptr(PyObject *obj, map_type **val) { static int asptr(PyObject *obj, map_type **val) {
int res = SWIG_ERROR; int res = SWIG_ERROR;
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
if (PyDict_Check(obj)) { if (PyDict_Check(obj)) {
SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
%#if PY_VERSION_HEX >= 0x03000000 %#if PY_VERSION_HEX >= 0x03000000
@ -32,6 +33,7 @@
res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0); res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0);
if (SWIG_IsOK(res) && val) *val = p; if (SWIG_IsOK(res) && val) *val = p;
} }
SWIG_PYTHON_THREAD_END_BLOCK;
return res; return res;
} }
}; };
@ -47,10 +49,10 @@
if (desc && desc->clientdata) { if (desc && desc->clientdata) {
return SWIG_NewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN); return SWIG_NewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN);
} else { } else {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
size_type size = map.size(); size_type size = map.size();
int pysize = (size <= (size_type) INT_MAX) ? (int) size : -1; int pysize = (size <= (size_type) INT_MAX) ? (int) size : -1;
if (pysize < 0) { if (pysize < 0) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"map size not valid in python"); "map size not valid in python");
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
@ -62,6 +64,7 @@
swig::SwigVar_PyObject val = swig::from(i->second); swig::SwigVar_PyObject val = swig::from(i->second);
PyDict_SetItem(obj, key, val); PyDict_SetItem(obj, key, val);
} }
SWIG_PYTHON_THREAD_END_BLOCK;
return obj; return obj;
} }
} }
@ -165,8 +168,8 @@
PyObject* keys() { PyObject* keys() {
Map::size_type size = self->size(); Map::size_type size = self->size();
int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1; int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
if (pysize < 0) { if (pysize < 0) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"map size not valid in python"); "map size not valid in python");
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
@ -177,14 +180,15 @@
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyList_SET_ITEM(keyList, j, swig::from(i->first)); PyList_SET_ITEM(keyList, j, swig::from(i->first));
} }
SWIG_PYTHON_THREAD_END_BLOCK;
return keyList; return keyList;
} }
PyObject* values() { PyObject* values() {
Map::size_type size = self->size(); Map::size_type size = self->size();
int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1; int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
if (pysize < 0) { if (pysize < 0) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"map size not valid in python"); "map size not valid in python");
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
@ -195,14 +199,15 @@
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyList_SET_ITEM(valList, j, swig::from(i->second)); PyList_SET_ITEM(valList, j, swig::from(i->second));
} }
SWIG_PYTHON_THREAD_END_BLOCK;
return valList; return valList;
} }
PyObject* items() { PyObject* items() {
Map::size_type size = self->size(); Map::size_type size = self->size();
int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1; int pysize = (size <= (Map::size_type) INT_MAX) ? (int) size : -1;
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
if (pysize < 0) { if (pysize < 0) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"map size not valid in python"); "map size not valid in python");
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
@ -213,6 +218,7 @@
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyList_SET_ITEM(itemList, j, swig::from(*i)); PyList_SET_ITEM(itemList, j, swig::from(*i));
} }
SWIG_PYTHON_THREAD_END_BLOCK;
return itemList; return itemList;
} }