com php-src: Fixed segfault in resourcebundle: ext/intl/resourc ebundle/resourcebundle_class.c ext/intl/resourcebundle/re sourcebundle_iterator.c

Commit: f096bc4d86ce1736bfc89dc5e0e0d70b027cf799 Author: Xinchen Hui <laruence@php.net> Sun, 29 Jun 2014 22:30:32 +0800 Parents: 7d492e3fd4b4964faa6155ad5335ac4689278476 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f096bc4d86ce1736bfc89dc5e0e0d70b027cf799 Log: Fixed segfault in resourcebundle Changed paths: M ext/intl/resourcebundle/resourcebundle_class.c M ext/intl/resourcebundle/resourcebundle_iterator.c Diff: diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index 2635850..8d6ce87 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 4cefd6c..bdedfd1 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;