From: Scott MacVicar <scottmac@php.net>
Date: Thu, 29 Jan 2009 22:59:57 +0000 (+0000)
Subject: MFB Fix bug #47245 - Double free in mb_detect_encoding()
X-Git-Tag: RELEASE_1_3_5~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09370413757acd3ac21c775134ad1249a7d43d5e;p=php

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

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index e26bbbebc4..471dbdb3ab 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3187,6 +3187,7 @@ PHP_FUNCTION(mb_detect_encoding)
 			if (!php_mb_parse_encoding_array(encoding_list, &list, &size, 0 TSRMLS_CC)) {
 				if (list) {
 					efree(list);
+					list = NULL;
 					size = 0;
 				}
 			}
@@ -3196,6 +3197,7 @@ PHP_FUNCTION(mb_detect_encoding)
 			if (!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) {
 				if (list) {
 					efree(list);
+					list = NULL;
 					size = 0;
 				}
 			}