From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jun 2014 14:30:32 +0000 (+0800)
Subject: Fixed segfault in resourcebundle
X-Git-Tag: POST_PHPNG_MERGE~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f096bc4d86ce1736bfc89dc5e0e0d70b027cf799;p=php

Fixed segfault in resourcebundle
---

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;