com php-src: Z_STRLEN vs Z_STRSIZE: Zend/zend_com pile.c
| From: | Anatol Belski | Date: | Tue, 17 Dec 2013 08:26:07 +0000 |
| Subject: | com php-src: Z_STRLEN vs Z_STRSIZE: Zend/zend_com pile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74472@lists.php.net to get a copy of this message | ||
Commit: 170c4d1fe66645682b9d37acd6bd4d38a280ee85
Author: Anatol Belski <ab@php.net> Tue, 17 Dec 2013 09:26:07 +0100
Parents: 167fdaa0e7aea1ea9729c5dfe229411b3de12eb2
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=170c4d1fe66645682b9d37acd6bd4d38a280ee85
Log:
Z_STRLEN vs Z_STRSIZE
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 281ce63..285e735 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -666,7 +666,7 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar
hash = str_hash(Z_STRVAL(varname->u.constant), Z_STRSIZE(varname->u.constant));
if (!zend_is_auto_global_quick(Z_STRVAL(varname->u.constant),
Z_STRSIZE(varname->u.constant), hash TSRMLS_CC) &&
- !(Z_STRLEN(varname->u.constant) == (sizeof("this")-1) &&
+ !(Z_STRSIZE(varname->u.constant) == (sizeof("this")-1) &&
!memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this") - 1))
&&
(CG(active_op_array)->last == 0 ||
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode !=
ZEND_BEGIN_SILENCE)) {