diff options
| author | Anatol Belski <ab@php.net> | 2016-08-29 18:57:50 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-29 18:57:50 +0200 |
| commit | 5c8aa478da029879950650cc89cd830fb0876ed4 (patch) | |
| tree | 192d8cecf6d6039d7f4459980ed5c6875b850754 | |
| parent | 3196ea195bdf242ebbf3496bef06232a82895794 (diff) | |
| parent | 1d9308693756342578c13339a078d79f6f37d7c0 (diff) | |
| download | php-git-5c8aa478da029879950650cc89cd830fb0876ed4.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix double free
| -rw-r--r-- | ext/intl/uchar/uchar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index a7e5c17340..1e0041f03c 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -566,8 +566,8 @@ IC_METHOD(getFC_NFKC_Closure) { error = U_ZERO_ERROR; u8str = intl_convert_utf16_to_utf8(closure, closure_len, &error); - efree(closure); INTL_CHECK_STATUS(error, "Failed converting output to UTF8"); + efree(closure); RETVAL_NEW_STR(u8str); } /* }}} */ |