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

Fix memory leak in std::pair Python binding

Browse source
This commit is contained in:
Robert Langlois 2016-12-17 13:27:25 -08:00
commit 631f0c34cc
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/python/std_pair.i
View file

@ -68,10 +68,18 @@
value_type *vp = %new_instance(std::pair<T,U>); value_type *vp = %new_instance(std::pair<T,U>);
T *pfirst = &(vp->first); T *pfirst = &(vp->first);
int res1 = swig::asval((PyObject*)first, pfirst); int res1 = swig::asval((PyObject*)first, pfirst);
if (!SWIG_IsOK(res1)) return res1; if (!SWIG_IsOK(res1))
{
%delete(vp);
return res1;
}
U *psecond = &(vp->second); U *psecond = &(vp->second);
int res2 = swig::asval((PyObject*)second, psecond); int res2 = swig::asval((PyObject*)second, psecond);
if (!SWIG_IsOK(res2)) return res2; if (!SWIG_IsOK(res2))
{
%delete(vp);
return res2;
}
*val = vp; *val = vp;
return SWIG_AddNewMask(res1 > res2 ? res1 : res2); return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
} else { } else {