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

18 years ago · 0937041375
1 changed files with 2 additions and 0 deletions
--- 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;
 				}
 			}