com php-src: Fixed Calendar_objects_free: ext/intl/cale ndar/calendar_class.cpp
| From: | Xinchen Hui | Date: | Sat, 28 Jun 2014 12:58:50 +0000 |
| Subject: | com php-src: Fixed Calendar_objects_free: ext/intl/cale ndar/calendar_class.cpp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79103@lists.php.net to get a copy of this message | ||
Commit: 5614467c6b055a8978aeef7ec4577cbf6c3c7cc8
Author: Xinchen Hui <laruence@php.net> Sat, 28 Jun 2014 20:58:50 +0800
Parents: e328e890ac0030714011df9e3bd55824bbbbd493
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5614467c6b055a8978aeef7ec4577cbf6c3c7cc8
Log:
Fixed Calendar_objects_free
Changed paths:
M ext/intl/calendar/calendar_class.cpp
Diff:
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index 71de7f7..e5d1ecd 100644
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@ -235,7 +235,7 @@ static void Calendar_objects_dtor(zend_object *object TSRMLS_DC)
/* {{{ Calendar_objects_free */
static void Calendar_objects_free(zend_object *object TSRMLS_DC)
{
- Calendar_object* co = (Calendar_object*) object;
+ Calendar_object* co = php_intl_calendar_fetch_object(object);
if (co->ucal) {
delete co->ucal;
@@ -244,8 +244,6 @@ static void Calendar_objects_free(zend_object *object TSRMLS_DC)
intl_error_reset(CALENDAR_ERROR_P(co) TSRMLS_CC);
zend_object_std_dtor(&co->zo TSRMLS_CC);
-
- efree(co);
}
/* }}} */