com php-src: Fixed segfault: ext/intl/intl_data.h
| From: | Xinchen Hui | Date: | Sun, 29 Jun 2014 07:53:42 +0000 |
| Subject: | com php-src: Fixed segfault: ext/intl/intl_data.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79112@lists.php.net to get a copy of this message | ||
Commit: 3b7e19ad73c28eb4830174a0c98a8f3be5d702d3
Author: Xinchen Hui <laruence@php.net> Sun, 29 Jun 2014 15:53:42 +0800
Parents: 704e98072eb488b6d68a84d5bd93f2119d821732
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b7e19ad73c28eb4830174a0c98a8f3be5d702d3
Log:
Fixed segfault
Changed paths:
M ext/intl/intl_data.h
Diff:
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h
index 5c65b9c..4dd1508 100644
--- a/ext/intl/intl_data.h
+++ b/ext/intl/intl_data.h
@@ -69,8 +69,8 @@ typedef struct _intl_data {
if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) \
{ \
intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 TSRMLS_CC ); \
- zval_dtor(return_value); \
- RETURN_NULL(); \
+ Z_OBJ_P(return_value) = NULL; \
+ return; \
}
#define INTL_METHOD_RETVAL_UTF8(obj, ustring, ulen, free_it) \