From 1a840b9af0117f6ac4c2030dc0f8c562a0f453ba Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 29 Aug 2016 19:27:47 +0200 Subject: fix double free --- ext/intl/msgformat/msgformat_format.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index 55ec9e84ba..25c9619133 100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -51,11 +51,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); -- cgit v1.2.1