diff options
author | Xinchen Hui <laruence@php.net> | 2014-06-29 00:29:07 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2014-06-29 00:29:07 +0800 |
commit | e1437022e188747495badcfa2b86282456bc27e8 (patch) | |
tree | 5f09b0a0dd280232acb0d6ee6fe71cd0607f3710 /ext/intl/common/common_enum.cpp | |
parent | 1d793348067e5769144c0f7efd86428a4137baec (diff) | |
download | php-git-e1437022e188747495badcfa2b86282456bc27e8.tar.gz |
Fixed segfault, segfault and segfault
Diffstat (limited to 'ext/intl/common/common_enum.cpp')
-rw-r--r-- | ext/intl/common/common_enum.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp index 3436e5843f..e63e091edf 100644 --- a/ext/intl/common/common_enum.cpp +++ b/ext/intl/common/common_enum.cpp @@ -54,7 +54,6 @@ void zoi_with_current_dtor(zend_object_iterator *iter TSRMLS_DC) * not finding the memory of this iterator allocated anymore. */ iter->funcs->invalidate_current(iter TSRMLS_CC); zoiwc->destroy_it(iter TSRMLS_CC); - efree(iter); } } @@ -165,8 +164,6 @@ static void IntlIterator_objects_free(zend_object *object TSRMLS_DC) intl_error_reset(INTLITERATOR_ERROR_P(ii) TSRMLS_CC); zend_object_std_dtor(&ii->zo TSRMLS_CC); - - efree(ii); } static zend_object_iterator *IntlIterator_get_iterator( @@ -198,7 +195,7 @@ static zend_object *IntlIterator_object_create(zend_class_entry *ce TSRMLS_DC) intern = (IntlIterator_object*)ecalloc(1, sizeof(IntlIterator_object) + sizeof(zval) * (ce->default_properties_count - 1)); zend_object_std_init(&intern->zo, ce TSRMLS_CC); - object_properties_init((zend_object*) intern, ce); + object_properties_init(&intern->zo, ce); intl_error_init(INTLITERATOR_ERROR_P(intern) TSRMLS_CC); intern->iterator = NULL; |