cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c
| From: | Scott MacVicar | Date: | Thu, 29 Jan 2009 22:59:58 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56019@lists.php.net to get a copy of this message | ||
scottmac Thu Jan 29 22:59:58 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
MFB Fix bug #47245 - Double free in mb_detect_encoding()
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.44&r2=1.224.2.22.2.25.2.45&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.44
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.45
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.44 Mon Jan 5 09:14:58 2009
+++ php-src/ext/mbstring/mbstring.c Thu Jan 29 22:59:57 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.44 2009/01/05 09:14:58 tony2001 Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.45 2009/01/29 22:59:57 scottmac Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3187,6 +3187,7 @@
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 @@
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;
}
}