diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-29 22:56:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-29 22:56:27 +0800 |
| commit | 499293449bbd3ef2f7dd3e904ee1a469e4ea0433 (patch) | |
| tree | 7d2e2a5b9eff7a33ef9ab5633926255325b1d60b /ext/intl/calendar | |
| parent | f096bc4d86ce1736bfc89dc5e0e0d70b027cf799 (diff) | |
| download | php-git-499293449bbd3ef2f7dd3e904ee1a469e4ea0433.tar.gz | |
Fixed segfault in intlgregcal_create_instance
Diffstat (limited to 'ext/intl/calendar')
| -rw-r--r-- | ext/intl/calendar/gregoriancalendar_methods.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index e08d263723..41e2735485 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -182,7 +182,8 @@ U_CFUNC PHP_FUNCTION(intlgregcal_create_instance) _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJ_P(return_value) == NULL) { - zend_object_store_ctor_failed(Z_OBJ(orig) TSRMLS_CC); + zval_dtor(&orig); + RETURN_NULL(); } } |