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

Eliminate SWIG_classWrapper property

Browse source 
Instead set the _cPtr property to PHP NULL to signal that this object
uses swig_object_wrapper.
This commit is contained in:
Olly Betts 2021-04-01 15:10:10 +13:00
commit e0cffb81dd
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/php/phprun.swg
View file

@ -238,7 +238,7 @@ SWIG_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags) {
if (ht) {
zval * _cPtr = zend_hash_str_find(ht, "_cPtr", sizeof("_cPtr") - 1);
if (_cPtr) {
if (zend_hash_str_exists(ht, "SWIG_classWrapper", sizeof("SWIG_classWrapper") - 1)) {
if (Z_TYPE_P(_cPtr) == IS_NULL) {
/* FIXME - we need to check the type is compatible here! */
*ptr = SWIG_Z_FETCH_OBJ_P(z)->ptr;
return (*ptr == NULL ? -1 : 0);
@ -274,7 +274,6 @@ SWIG_pack_zval(zval *zv, void *ptr, int userNewObj) {
static void
SWIG_generalize_object(zval *zval_obj, void *ptr, int userNewObj, swig_type_info *type) {
zval tempZval;
HashTable *ht = 0;
SWIG_pack_zval(zval_obj, ptr, userNewObj);
@ -285,10 +284,9 @@ SWIG_generalize_object(zval *zval_obj, void *ptr, int userNewObj, swig_type_info
#endif
if(ht) {
ZVAL_RES(&tempZval,zend_register_resource(ptr,*(int *)(type->clientdata)));
zend_hash_str_add(ht, "_cPtr", sizeof("_cPtr") - 1, &tempZval);
ZVAL_TRUE(&tempZval);
zend_hash_str_add(ht, "SWIG_classWrapper", sizeof("SWIG_classWrapper") - 1, &tempZval);
zval z;
ZVAL_NULL(&z);
zend_hash_str_add(ht, "_cPtr", sizeof("_cPtr") - 1, &z);
}
}