com php-src: Resolve futher interning issues: Zend/zend_compi le.c

From: Date: Thu, 24 Jul 2014 19:35:57 +0000
Subject: com php-src: Resolve futher interning issues: Zend/zend_compi le.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80923@lists.php.net to get a copy of this message
Commit: 1644bf01da71f89170093932cd96d81cc0a32c3c Author: Nikita Popov <nikic@php.net> Thu, 24 Jul 2014 21:35:57 +0200 Parents: c777427c0851bbfeb2b5c842265779233a24fd96 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1644bf01da71f89170093932cd96d81cc0a32c3c Log: Resolve futher interning issues Not sure if this is the right way to do it ... Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d402ff7..82e428c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -140,6 +140,19 @@ static void zend_destroy_property_info_internal(zval *zv) /* {{{ */ } /* }}} */ +static zend_string *zend_new_interned_string_safe(zend_string *str TSRMLS_DC) { + zend_string *interned_str; + + STR_ADDREF(str); + interned_str = zend_new_interned_string(str TSRMLS_CC); + if (str != interned_str) { + return interned_str; + } else { + STR_RELEASE(str); + return str; + } +} + static void build_runtime_defined_function_key(zval *result, zend_string *name, unsigned char *lex_pos TSRMLS_DC) /* {{{ */ { char char_pos_buf[32]; @@ -5908,7 +5921,7 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { ZVAL_NULL(&value_zv); } - name = zend_new_interned_string(name TSRMLS_CC); + name = zend_new_interned_string_safe(name TSRMLS_CC); zend_declare_property_ex(ce, name, &value_zv, flags, NULL /* TODO.AST doc comment */ TSRMLS_CC); } } @@ -5937,7 +5950,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed in class constants"); } - name = zend_new_interned_string(name TSRMLS_CC); + name = zend_new_interned_string_safe(name TSRMLS_CC); if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", ce->name->val, name);

« previous php.cvs (#80923) next »