com php-src: Added check for interned strings: Zend/zend_comp ile.c

From: Date: Tue, 01 Apr 2014 10:19:43 +0000
Subject: com php-src: Added check for interned strings: Zend/zend_comp ile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77504@lists.php.net to get a copy of this message
Commit: 9b196ca6e872369263c55e66ceca0183f75d6420 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 14:19:43 +0400 Parents: 98ca90c91095d13bad7e9f17d89c3fc0abdbc4be Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b196ca6e872369263c55e66ceca0183f75d6420 Log: Added check for interned strings Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 9ba40df..8dcaf29 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3871,6 +3871,7 @@ static zend_bool do_inherit_constant_check(HashTable *child_constants_table, con (Z_TYPE_P(old_constant) == IS_LONG && Z_LVAL_P(old_constant) != Z_LVAL_P(parent_constant)) || (Z_TYPE_P(old_constant) == IS_BOOL && Z_LVAL_P(old_constant) != Z_LVAL_P(parent_constant)) || (Z_TYPE_P(old_constant) == IS_DOUBLE && Z_DVAL_P(old_constant) != Z_DVAL_P(parent_constant)) || + (Z_TYPE_P(old_constant) == IS_STRING && Z_STR_P(old_constant) != Z_STR_P(parent_constant)) || (Z_REFCOUNTED_P(old_constant) && Z_COUNTED_P(old_constant) != Z_COUNTED_P(parent_constant))) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot inherit previously-inherited or override constant %s from interface %s", hash_key->key->val, iface->name->val); }

« previous php.cvs (#77504) next »