clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve futher interning issues

Browse Source 
Not sure if this is the right way to do it ...
This commit is contained in:
Nikita Popov 2014-07-24 21:35:57 +02:00
parent c777427c08
commit 1644bf01da
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zend/zend_compile.c
View File

@ -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) /* {{{ */ static void build_runtime_defined_function_key(zval *result, zend_string *name, unsigned char *lex_pos TSRMLS_DC) /* {{{ */
{ {
char char_pos_buf[32]; char char_pos_buf[32];
@ -5908,7 +5921,7 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) {
ZVAL_NULL(&value_zv); 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); 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"); 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) { if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s",
ce->name->val, name); ce->name->val, name);