com php-src: Fixed segfault temporarily (probably need to be reverted later): ext/intl/common/common_enum.cpp
| From: | Xinchen Hui | Date: | Sun, 29 Jun 2014 07:45:08 +0000 |
| Subject: | com php-src: Fixed segfault temporarily (probably need to be reverted later): ext/intl/common/common_enum.cpp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79111@lists.php.net to get a copy of this message | ||
Commit: 704e98072eb488b6d68a84d5bd93f2119d821732
Author: Xinchen Hui <laruence@php.net> Sun, 29 Jun 2014 15:45:08 +0800
Parents: 0b12c08363d9277bfc2cbefb237a0f3f8147b146
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=704e98072eb488b6d68a84d5bd93f2119d821732
Log:
Fixed segfault temporarily (probably need to be reverted later)
Changed paths:
M ext/intl/common/common_enum.cpp
Diff:
diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp
index e63e091..e9d052d 100644
--- a/ext/intl/common/common_enum.cpp
+++ b/ext/intl/common/common_enum.cpp
@@ -141,9 +141,9 @@ U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *ob
{
IntlIterator_object *ii;
object_init_ex(object, IntlIterator_ce_ptr);
- ii = (IntlIterator_object*)Z_OBJ_P(object);
+ ii = Z_INTL_ITERATOR_P(object);
ii->iterator = (zend_object_iterator*)emalloc(sizeof(zoi_with_current));
- zend_iterator_init(ii->iterator TSRMLS_CC);
+ //????????? dtor zend_iterator_init(ii->iterator TSRMLS_CC);
ZVAL_PTR(&ii->iterator->data, se);
ii->iterator->funcs = &string_enum_object_iterator_funcs;
ii->iterator->index = 0;