com php-src: Fix the fix for #68884: ext/intl/breakiterator/bre akiterator_iterators.cpp
| From: | Stanislav Malyshev | Date: | Sun, 25 Jan 2015 07:07:50 +0000 |
| Subject: | com php-src: Fix the fix for #68884: ext/intl/breakiterator/bre akiterator_iterators.cpp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84361@lists.php.net to get a copy of this message | ||
Commit: cb6fb59b59567004194d057661bdae7b2d9e6687
Author: Stanislav Malyshev <stas@php.net> Sat, 24 Jan 2015 14:14:53 -0800
Parents: 388624d35940952b6dc79ccef9f85014ef3fa550
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cb6fb59b59567004194d057661bdae7b2d9e6687
Log:
Fix the fix for #68884
Bugs:
https://bugs.php.net/68884
Changed paths:
M ext/intl/breakiterator/breakiterator_iterators.cpp
Diff:
diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp
b/ext/intl/breakiterator/breakiterator_iterators.cpp
index b08da64..93a49d1 100644
--- a/ext/intl/breakiterator/breakiterator_iterators.cpp
+++ b/ext/intl/breakiterator/breakiterator_iterators.cpp
@@ -256,7 +256,7 @@ U_CFUNC zend_function *IntlPartsIterator_get_method(zend_object **object_ptr, ze
}
if (method->len == sizeof("getrulestatus") - 1
- && memcmp("getrulestatus", lc_method_name->val, method->len) == 0) {
+ && memcmp("getrulestatus", lc_method_name->val, lc_method_name->len) ==
0) {
IntlIterator_object *obj = php_intl_iterator_fetch_object(*object_ptr);
if (obj->iterator && !Z_ISUNDEF(obj->iterator->data)) {
zval *break_iter_zv = &obj->iterator->data;