Skip to content

Commit b731518

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Set trailing zero
2 parents f166ea9 + 24d5adb commit b731518

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6261,7 +6261,7 @@ void zend_compile_use(zend_ast *ast) /* {{{ */
62616261
zend_string *ns_name = zend_string_alloc(ZSTR_LEN(current_ns) + 1 + ZSTR_LEN(new_name), 0);
62626262
zend_str_tolower_copy(ZSTR_VAL(ns_name), ZSTR_VAL(current_ns), ZSTR_LEN(current_ns));
62636263
ZSTR_VAL(ns_name)[ZSTR_LEN(current_ns)] = '\\';
6264-
memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name));
6264+
memcpy(ZSTR_VAL(ns_name) + ZSTR_LEN(current_ns) + 1, ZSTR_VAL(lookup_name), ZSTR_LEN(lookup_name) + 1);
62656265

62666266
zend_check_use_conflict(type, old_name, new_name, ns_name);
62676267

0 commit comments

Comments
 (0)