-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 >> This following patch looks good to me: > Derick, thanks , > > Stas, should I commit this into 5.4 now or hold from ci until the > release of 5.4?
Please wait for stas okay, but personally I want to see this committed. > > thanks >> >>> Index: Zend/zend_execute_API.c >>> =================================================================== >>> >>> - --- Zend/zend_execute_API.c (revision 323082) >>> +++ Zend/zend_execute_API.c (working copy) @@ -1195,11 >>> +1195,12 @@ } CG(interactive) = 0; >>> >>> - retval = SUCCESS; zend_try { >>> zend_execute(new_op_array TSRMLS_CC); } zend_catch { - >>> retval = FAILURE; + >>> destroy_op_array(new_op_array TSRMLS_CC); + >>> efree(new_op_array); + zend_bailout(); } >>> zend_end_try(); >>> >>> CG(interactive) = orig_interactive; @@ -1221,6 +1222,7 @@ >>> destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); >>> EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; + >>> retval = SUCCESS; } else { retval = FAILURE; } >> >> -- http://derickrethans.nl | http://xdebug.org Like Xdebug? >> Consider a donation: http://xdebug.org/donate.php twitter: >> @derickr and @xdebug > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPMT+RAAoJEAT0aMuPE7Z11xIQAJBGUgnDuxlCpcuxkEcj+lCx F+uwlyi23mmu320NVg5ZjDSUfNeLgkDXwb3O9mgMykL2c7ua6WjU94CcFSTZ2qbE QkPANHZHkn3sCLSUNe4nfrl21zIAeJAgCcifLsHdndRhG/FxyDXPlFygWlgSDMke dbTR8teo0FUrpvzzIVn5udKC+B+WeiIvIs5OI9e9KXW0/V4NKqf3HUPypmVyUqWN KSXjkKXa05cUHUzEYYNj4Gk9G0pbbGxduEO7s3cT1dZUbU3T2tP25dWRqlPnd84c tdQ/1cLQVtQwfl3PeFwOawNDOhSrKauxTCsKTK1ZZPYLsAa2oN+fdfPmy5SB2vXm i6y5tezg6teNVicSeS+BBvyVf1vDDu8jzZUVvfGkdAIJCwfbvYDvTGmbMJSds/9/ SdhvXam0zfoX34qa+inyO3fXyZp1x19V8XRY93pbLy9avcsGBEx/iEI5USze+p84 rmljwfAaKlPBYOsu+lPNEsotz6SGgGRwMHDjPNFtWo0+e0GJ2KIkh2GdGeZbKbuo SCOTWkn9gWUfQm5RLmRPHr92SJJh9n2lAfoZF1UdUwCGQw0oetfHaKaSKxF3BIBz IptVjcRephcP44syK7lsv24Z4ZmpCQ+n1xczGEhJsWrw30FUP2z1kzoF0tLHdgZ1 slr0Rq0SpFzOLhuASPtt =x1xK -----END PGP SIGNATURE----- -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php