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

[PHP] Fix cleanup code handling issues

Browse source 
Fix to call cleanup code in exception situations and not to invoke
the freearg typemap twice in certain situations.

Fixes https://sourceforge.net/p/swig/bugs/1211/
This commit is contained in:
Olly Betts 2022-02-17 13:02:05 +13:00
commit 1707d6b89b
9 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Modules/php.cxx
View file

@ -1031,6 +1031,7 @@ public:
Printf(f->code, "\tWRONG_PARAM_COUNT;\n}\n\n");
Printf(f->code, " if(!arg) {\n");
Printf(f->code, " zend_throw_exception(zend_ce_type_error, \"this pointer is NULL\", 0);\n");
Printf(f->code, " return;\n");
Printf(f->code, " }\n");
Printf(f->code, " arg2 = Z_STR(args[0]);\n\n");
@ -1405,7 +1406,7 @@ public:
Printv(f->code, outarg, NIL);
}
if (cleanup) {
if (static_setter && cleanup) {
Printv(f->code, cleanup, NIL);
}
@ -1698,8 +1699,10 @@ public:
"#ifndef SWIG_PHP_INTERFACE_", interface, "_CE\n",
" {\n",
" zend_class_entry *swig_interface_ce = zend_lookup_class(zend_string_init(\"", interface, "\", sizeof(\"", interface, "\") - 1, 0));\n",
" if (!swig_interface_ce) zend_throw_exception(zend_ce_error, \"Interface \\\"", interface, "\\\" not found\", 0);\n",
" zend_do_implement_interface(SWIG_Php_ce_", class_name, ", swig_interface_ce);\n",
" if (swig_interface_ce)\n",
" zend_do_implement_interface(SWIG_Php_ce_", class_name, ", swig_interface_ce);\n",
" else\n",
" zend_throw_exception(zend_ce_error, \"Interface \\\"", interface, "\\\" not found\", 0);\n",
" }\n",
"#endif\n",
NIL);