diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-12-01 17:00:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-12-01 17:00:42 +0300 |
| commit | b73151845f3b43f8d8fee6376d183c3a119fd969 (patch) | |
| tree | 5c03f64ef253c7c1f02ef3de6c7766404f4ff933 | |
| parent | f166ea9c09df1824862589f2938ac0779661c8f6 (diff) | |
| parent | 24d5adbd5a5e61cc8f811afffcfae9ddd86b78e0 (diff) | |
| download | php-git-b73151845f3b43f8d8fee6376d183c3a119fd969.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Set trailing zero
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bc4e3f0bd0..8cb69009df 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6261,7 +6261,7 @@ 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); |