com php-src: Merge branch 'PHP-7.1' into PHP-7.2: Zend/zend_c ompile.c

Commit: 01b85f0e1773c540b978520cc8c7449425aca02b Author: Dmitry Stogov <dmitry@zend.com> Fri, 1 Dec 2017 17:00:51 +0300 Parents: b6a27c73322adc269355fd7eacbefad074258a39 b73151845f3b43f8d8fee6376d183c3a119fd969 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01b85f0e1773c540b978520cc8c7449425aca02b Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Set trailing zero Changed paths: MM Zend/zend_compile.c Diff: diff --cc Zend/zend_compile.c index 0772bc4,8cb6900..629d695 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -6558,11 -6261,9 +6558,11 @@@ void zend_compile_use(zend_ast *ast) / zend_string *ns_name = zend_string_alloc(ZSTR_LEN(current_ns) + 1 + ZSTR_LEN(new_name), 0); zend_str_tolower_copy(ZSTR_VAL(ns_name), ZSTR_VAL(current_ns), ZSTR_LEN(current_ns)); ZSTR_VAL(ns_name)[ZSTR_LEN(current_ns)] = '\\'; - memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name)); + memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name) + 1); - zend_check_use_conflict(type, old_name, new_name, ns_name); + if (zend_have_seen_symbol(ns_name, type)) { + zend_check_already_in_use(type, old_name, new_name, ns_name); + } zend_string_free(ns_name); } else {