cvs: php-src(PHP_5_0) /ext/mbstring mbstring.c
| From: | Antony Dovgal | Date: | Fri, 28 Jan 2005 01:58:27 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30191@lists.php.net to get a copy of this message | ||
tony2001 Thu Jan 27 20:58:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring mbstring.c
Log:
fix #31732 (mb_get_info causes segfault)
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.214.2.1&r2=1.214.2.2&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.214.2.1 php-src/ext/mbstring/mbstring.c:1.214.2.2
--- php-src/ext/mbstring/mbstring.c:1.214.2.1 Sun Jan 16 10:55:41 2005
+++ php-src/ext/mbstring/mbstring.c Thu Jan 27 20:58:26 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.214.2.1 2005/01/16 15:55:41 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.214.2.2 2005/01/28 01:58:26 tony2001 Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3229,7 +3229,7 @@
RETURN_FALSE;
}
- if (!strcasecmp("all", typ)) {
+ if (!typ || !strcasecmp("all", typ)) {
array_init(return_value);
if ((name = (char *)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
add_assoc_string(return_value, "internal_encoding", name, 1);