diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-08-29 20:37:01 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-08-29 20:37:01 +0300 |
| commit | 722783c2c671353c93acd0718e1481c8969fe561 (patch) | |
| tree | 1fbf453a75b418524600e1948e765c7c5cb2246b /ext | |
| parent | 94fbcbe17265b11e26dee6cfaf2bb7913beef461 (diff) | |
| parent | a349afd26bb299f2c087222850d5a149f44e9f68 (diff) | |
| download | php-git-722783c2c671353c93acd0718e1481c8969fe561.tar.gz | |
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
fix double free
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/intl/msgformat/msgformat_format.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index 959a4fd5a0..73fb5eeff6 100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -50,11 +50,10 @@ static void msgfmt_do_format(MessageFormatter_object *mfo, zval *args, zval *ret zend_hash_destroy(args_copy); efree(args_copy); - if (formatted && U_FAILURE(INTL_DATA_ERROR_CODE(mfo))) { - efree(formatted); - } - if (U_FAILURE(INTL_DATA_ERROR_CODE(mfo))) { + if (formatted) { + efree(formatted); + } RETURN_FALSE; } else { INTL_METHOD_RETVAL_UTF8(mfo, formatted, formatted_len, 1); |