summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-08-12 17:17:30 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-08-12 17:17:30 +0200
commit4cd563d07e388922f0469a820c1c0c34e5060ab4 (patch)
tree09bc4e0c2667aaac0d93ebbe0d3c840ad31476c3 /Zend
parent7aa1dd3ba15ccbb500b8b124795c08e6dbb8d43d (diff)
parentf3fdf570b3cd3df14af3d698950d341623a97088 (diff)
downloadphp-git-4cd563d07e388922f0469a820c1c0c34e5060ab4.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_compile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 284b92ea6e..0c576a86ca 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6694,6 +6694,7 @@ void zend_compile_use(zend_ast *ast) /* {{{ */
}
zend_string_addref(old_name);
+ old_name = zend_new_interned_string(old_name);
if (!zend_hash_add_ptr(current_import, lookup_name, old_name)) {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name "
"is already in use", zend_get_use_type_str(type), ZSTR_VAL(old_name), ZSTR_VAL(new_name));