archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Convert fatal errors into EngineExceptions

Browse source 
Make zval_update_constant_ex(), zval_update_constant(), zend_update_class_constants() and zend_ast_evaluate() return SUCCESS or FAILURE.
This commit is contained in:
Dmitry Stogov 2015-04-02 02:05:25 +03:00
parent 956fa034e3
commit ea09a9fa32
19 changed files with 328 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_inheritance.c
View file

@ -772,7 +772,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
if (parent_ce->type != ce->type) {
/* User class extends internal class */
zend_update_class_constants(parent_ce );
zend_update_class_constants(parent_ce);
if (parent_ce->default_static_members_count) {
int i = ce->default_static_members_count + parent_ce->default_static_members_count;