Can you MFH this to 5.2 as well.
On 10-Dec-08, at 9:56 PM, Scott MacVicar wrote:
scottmac Thu Dec 11 02:56:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
MFH Fix bug #46738 - Segfault when mb_detect_encoding() fails.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.38&r2=1.224.2.22.2.25.2.39&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.38 php-src/
ext/mbstring/mbstring.c:1.224.2.22.2.25.2.39
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.38 Mon Nov 17
11:27:56 2008
+++ php-src/ext/mbstring/mbstring.c Thu Dec 11 02:56:45 2008
@@ -17,7 +17,7 @@
+
----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.38 2008/11/17 11:27:56
felipe Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.39 2008/12/11 02:56:45
scottmac Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3227,7 +3227,7 @@
}
if (ret == NULL) {
- RETVAL_FALSE;
+ RETURN_FALSE;
}
RETVAL_STRING((char *)ret, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
