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

Fix segmentation faults with directors in PHP >= 5.4

Browse source
This commit is contained in:
Olly Betts 2014-09-09 13:39:30 -03:00
commit 0dd7b61c57
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.current
View file

@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.3 (in progress) Version 3.0.3 (in progress)
=========================== ===========================
2014-09-09: olly
[PHP] Fix segmentation faults with directors in PHP >= 5.4, and
reenable runme tests for director_basic testcase. Fix from
pavel-charvat in issue#164.
2014-09-05: ianlancetaylor 2014-09-05: ianlancetaylor
[Go] Add imtype, goin, goout, godirectorin, and [Go] Add imtype, goin, goout, godirectorin, and
godirectorout typemaps, to support writing Go code to godirectorout typemaps, to support writing Go code to

2
Examples/test-suite/php/director_basic_runme.php
View file

@ -3,7 +3,6 @@
require "tests.php"; require "tests.php";
require "director_basic.php"; require "director_basic.php";
/* Removed until runtime error is fixed, see https://github.com/swig/swig/issues/164
// No new functions // No new functions
check::functions(array(foo_ping,foo_pong,foo_get_self,a_f,a_rg,a1_ff,myclass_method,myclass_vmethod,myclass_pmethod,myclass_cmethod,myclass_get_self,myclass_call_pmethod,myclasst_i_method)); check::functions(array(foo_ping,foo_pong,foo_get_self,a_f,a_rg,a1_ff,myclass_method,myclass_vmethod,myclass_pmethod,myclass_cmethod,myclass_get_self,myclass_call_pmethod,myclasst_i_method));
// No new classes // No new classes
@ -54,7 +53,6 @@ $cc->method($b);
check::equal($bc->x, 34, "bc failed"); check::equal($bc->x, 34, "bc failed");
check::equal($bd->x, 16, "bd failed"); check::equal($bd->x, 16, "bd failed");
*/
check::done(); check::done();
?> ?>

2
Lib/php/phprun.swg
View file

@ -153,7 +153,7 @@ SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject
} }
Z_SET_REFCOUNT_P(z, 1); Z_SET_REFCOUNT_P(z, 1);
Z_SET_ISREF_P(z); Z_SET_ISREF_P(z);
zend_hash_update(HASH_OF(z), (char*)"_cPtr", sizeof("_cPtr"), (void*)&resource, sizeof(zval), NULL); zend_hash_update(HASH_OF(z), (char*)"_cPtr", sizeof("_cPtr"), (void*)&resource, sizeof(zval*), NULL);
} }
return; return;
} }