]> granicus.if.org Git - php/commitdiff
Fixed segfault
authorXinchen Hui <laruence@php.net>
Sun, 29 Jun 2014 07:53:42 +0000 (15:53 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 29 Jun 2014 07:53:42 +0000 (15:53 +0800)
ext/intl/intl_data.h

index 5c65b9c6ea213c6dea6269d2af0b12413976223d..4dd1508468ba1e7758f83bf35e451daab2a6cd93 100644 (file)
@@ -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)                                                                   \