com php-src: Set trailing zero: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Fri, 01 Dec 2017 14:00:11 +0000 |
| Subject: | com php-src: Set trailing zero: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100461@lists.php.net to get a copy of this message | ||
Commit: 24d5adbd5a5e61cc8f811afffcfae9ddd86b78e0
Author: Dmitry Stogov <dmitry@zend.com> Fri, 1 Dec 2017 17:00:11 +0300
Parents: 32e3d7b99e5f37d54d47bb385ef8d57c049b030a
Branches: PHP-7.0 PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24d5adbd5a5e61cc8f811afffcfae9ddd86b78e0
Log:
Set trailing zero
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index cd45300..b23e9f5 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5601,7 +5601,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);