cvs: php-src /ext/mbstring mbstring.c
| From: | Scott MacVicar | Date: | Thu, 11 Dec 2008 02:56:09 +0000 |
| Subject: | cvs: php-src /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54855@lists.php.net to get a copy of this message | ||
scottmac Thu Dec 11 02:56:09 2008 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Fix bug #46738 - Segfault when mb_detect_encoding() fails.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.305&r2=1.306&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.305 php-src/ext/mbstring/mbstring.c:1.306
--- php-src/ext/mbstring/mbstring.c:1.305 Mon Nov 17 11:26:21 2008
+++ php-src/ext/mbstring/mbstring.c Thu Dec 11 02:56:08 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.305 2008/11/17 11:26:21 felipe Exp $ */
+/* $Id: mbstring.c,v 1.306 2008/12/11 02:56:08 scottmac Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3058,7 +3058,7 @@
}
if (ret == NULL) {
- RETVAL_FALSE;
+ RETURN_FALSE;
}
RETVAL_STRING((char *)ret, 1);