summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-06-29 22:30:32 +0800
committerXinchen Hui <laruence@php.net>2014-06-29 22:30:32 +0800
commitf096bc4d86ce1736bfc89dc5e0e0d70b027cf799 (patch)
tree5bcf35b99b358486b05643317c899318fee9d0ac
parent7d492e3fd4b4964faa6155ad5335ac4689278476 (diff)
downloadphp-git-f096bc4d86ce1736bfc89dc5e0e0d70b027cf799.tar.gz
Fixed segfault in resourcebundle
-rw-r--r--ext/intl/resourcebundle/resourcebundle_class.c2
-rw-r--r--ext/intl/resourcebundle/resourcebundle_iterator.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 2635850a37..8d6ce87ac8 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -49,7 +49,7 @@ static void ResourceBundle_object_destroy( zend_object *object TSRMLS_DC )
ures_close( rb->child );
}
- zend_object_std_dtor( object TSRMLS_CC );
+ //???zend_object_std_dtor( object TSRMLS_CC );
}
/* }}} */
diff --git a/ext/intl/resourcebundle/resourcebundle_iterator.c b/ext/intl/resourcebundle/resourcebundle_iterator.c
index 4cefd6ce8e..bdedfd15bc 100644
--- a/ext/intl/resourcebundle/resourcebundle_iterator.c
+++ b/ext/intl/resourcebundle/resourcebundle_iterator.c
@@ -114,7 +114,7 @@ static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key T
}
/* }}} */
-/* {{{ resourcebundle_iterator_has_more */
+/* {{{ resourcebundle_iterator_step */
static void resourcebundle_iterator_step( zend_object_iterator *iter TSRMLS_DC )
{
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;