com php-src: Fixed incorrect string length comparison: Zend/zend_builtin_functions.c
| From: | Dmitry Stogov | Date: | Thu, 21 Aug 2014 07:17:24 +0000 |
| Subject: | com php-src: Fixed incorrect string length comparison: Zend/zend_builtin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80662@lists.php.net to get a copy of this message | ||
Commit: 92ac625b94e3dc79a0c9def934c61d83397afe81
Author: Dmitry Stogov <dmitry@zend.com> Thu, 21 Aug 2014 11:17:24 +0400
Parents: 887c12da77bed4053314d35329692957cc5d9ed0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92ac625b94e3dc79a0c9def934c61d83397afe81
Log:
Fixed incorrect string length comparison
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 636382d..5632f48 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1705,7 +1705,7 @@ static int copy_class_or_interface_name(zval *el TSRMLS_DC, int num_args,
va_lis
if ((hash_key->key && hash_key->key->val[0] != 0)
&& (comply_mask == (ce->ce_flags & mask))) {
if (ce->refcount > 1 &&
- (ce->name->len != hash_key->key->len - 1 ||
+ (ce->name->len != hash_key->key->len ||
!same_name(hash_key->key->val, ce->name->val, ce->name->len))) {
add_next_index_str(array, STR_COPY(hash_key->key));
} else {