com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend.h Zend/zend_a lloc.c Zend/zend_compile.c
Zend/zend_globals.h Zend/zend_string.c ext/opcache/ZendAccelerator.c ext/ session/mod_user_class.c ext/session/session.c ext/ spl/spl_iterators.c

Commit: 3e65d7dad025656b9e7000f1c01524211cd65a59 Author: Anatol Belski <ab@php.net> Thu, 26 Dec 2013 13:06:49 +0100 Parents: a5720b44938d51207f8b9b1cf1422bb29bbc03ff 65fd18fd884a9ed5e60275023baf423c87d2213a Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e65d7dad025656b9e7000f1c01524211cd65a59 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: Zend/zend_compile.c Changed paths: MM Zend/zend.h MM Zend/zend_alloc.c MM Zend/zend_compile.c MM Zend/zend_globals.h MM Zend/zend_string.c MM ext/opcache/ZendAccelerator.c MM ext/session/mod_user_class.c MM ext/session/session.c MM ext/spl/spl_iterators.c Diff: diff --cc Zend/zend_compile.c index 0ecac0b,a0ea594..09f2404 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -2460,19 -2460,19 +2460,19 @@@ void zend_do_build_full_name(znode *res } if (is_class_member) { - length = sizeof("::")-1 + Z_STRLEN(result->u.constant) + Z_STRLEN(name->u.constant); + length = sizeof("::")-1 + Z_STRSIZE(result->u.constant) + Z_STRSIZE(name->u.constant); - Z_STRVAL(result->u.constant) = erealloc(Z_STRVAL(result->u.constant), length+1); + Z_STRVAL(result->u.constant) = str_erealloc(Z_STRVAL(result->u.constant), length+1); - memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant)], "::", sizeof("::")-1); - memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant) + sizeof("::")-1], Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1); + memcpy(&Z_STRVAL(result->u.constant)[Z_STRSIZE(result->u.constant)], "::", sizeof("::")-1); + memcpy(&Z_STRVAL(result->u.constant)[Z_STRSIZE(result->u.constant) + sizeof("::")-1], Z_STRVAL(name->u.constant), Z_STRSIZE(name->u.constant)+1); str_efree(Z_STRVAL(name->u.constant)); - Z_STRLEN(result->u.constant) = length; + Z_STRSIZE(result->u.constant) = length; } else { - length = sizeof("\\")-1 + Z_STRLEN(result->u.constant) + Z_STRLEN(name->u.constant); + length = sizeof("\\")-1 + Z_STRSIZE(result->u.constant) + Z_STRSIZE(name->u.constant); - Z_STRVAL(result->u.constant) = erealloc(Z_STRVAL(result->u.constant), length+1); + Z_STRVAL(result->u.constant) = str_erealloc(Z_STRVAL(result->u.constant), length+1); - memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant)], "\\", sizeof("\\")-1); - memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant) + sizeof("\\")-1], Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1); + memcpy(&Z_STRVAL(result->u.constant)[Z_STRSIZE(result->u.constant)], "\\", sizeof("\\")-1); + memcpy(&Z_STRVAL(result->u.constant)[Z_STRSIZE(result->u.constant) + sizeof("\\")-1], Z_STRVAL(name->u.constant), Z_STRSIZE(name->u.constant)+1); str_efree(Z_STRVAL(name->u.constant)); - Z_STRLEN(result->u.constant) = length; + Z_STRSIZE(result->u.constant) = length; } } /* }}} */