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

Fix memory leaks in SWIGTYPE typemaps

Browse source 
The "out" and "directorin" typemaps allocate a new object, but weren't
specifying that this object should be owned.
This commit is contained in:
Olly Betts 2017-09-14 09:32:16 +12:00
commit 0185b6114f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/php/php.swg
View file

@ -438,19 +438,19 @@
#ifdef __cplusplus #ifdef __cplusplus
{ {
$&1_ltype resultobj = new $1_ltype((const $1_ltype &) $1); $&1_ltype resultobj = new $1_ltype((const $1_ltype &) $1);
SWIG_SetZval(return_value, $needNewFlow, $owner, (void *)resultobj, $&1_descriptor, $zend_obj); SWIG_SetZval(return_value, $needNewFlow, 1, (void *)resultobj, $&1_descriptor, $zend_obj);
} }
#else #else
{ {
$&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type)); $&1_ltype resultobj = ($&1_ltype) emalloc(sizeof($1_type));
memcpy(resultobj, &$1, sizeof($1_type)); memcpy(resultobj, &$1, sizeof($1_type));
SWIG_SetZval(return_value, $needNewFlow, $owner, (void *)resultobj, $&1_descriptor, $zend_obj); SWIG_SetZval(return_value, $needNewFlow, 1, (void *)resultobj, $&1_descriptor, $zend_obj);
} }
#endif #endif
%typemap(directorin) SWIGTYPE %typemap(directorin) SWIGTYPE
%{ %{
SWIG_SetZval($input, $needNewFlow, $owner, SWIG_as_voidptr(new $1_ltype((const $1_ltype &)$1)), $&1_descriptor, $zend_obj); SWIG_SetZval($input, $needNewFlow, 1, SWIG_as_voidptr(new $1_ltype((const $1_ltype &)$1)), $&1_descriptor, $zend_obj);
%} %}
%typemap(out) void ""; %typemap(out) void "";