From: Scott MacVicar <scottmac@php.net>
Date: Thu, 29 Jan 2009 22:58:52 +0000 (+0000)
Subject: Fix bug #47245 - Double free in mb_detect_encoding()
X-Git-Tag: php-5.2.9RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d84d3e47f33d3c4193bc3d3e17d4ddc6dfafe836;p=php

Fix bug #47245 - Double free in mb_detect_encoding()
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 8c0ac175b8..ed186255d0 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2666,6 +2666,7 @@ PHP_FUNCTION(mb_detect_encoding)
 			if (!php_mb_parse_encoding_array(*arg_list, &list, &size, 0 TSRMLS_CC)) {
 				if (list) {
 					efree(list);
+					list = NULL;
 					size = 0;
 				}
 			}
@@ -2675,6 +2676,7 @@ PHP_FUNCTION(mb_detect_encoding)
 			if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg_list), Z_STRLEN_PP(arg_list), &list, &size, 0 TSRMLS_CC)) {
 				if (list) {
 					efree(list);
+					list = NULL;
 					size = 0;
 				}
 			}