cvs: php-src /ext/mbstring mbstring.c
| From: | Moriyoshi Koizumi | Date: | Tue, 19 Aug 2003 14:48:33 +0000 |
| Subject: | cvs: php-src /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23314@lists.php.net to get a copy of this message | ||
moriyoshi Tue Aug 19 10:48:33 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
More accurate fix for bug #25140
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.188 php-src/ext/mbstring/mbstring.c:1.189
--- php-src/ext/mbstring/mbstring.c:1.188 Tue Aug 19 04:29:56 2003
+++ php-src/ext/mbstring/mbstring.c Tue Aug 19 10:48:33 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.188 2003/08/19 08:29:56 derick Exp $ */
+/* $Id: mbstring.c,v 1.189 2003/08/19 14:48:33 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -1864,7 +1864,7 @@
if (output_len) {
*output_len = 0;
}
- if ( !input || !length) {
+ if (!input) {
return NULL;
}
/* new encoding */
@@ -2004,7 +2004,7 @@
if (ret != NULL) {
RETVAL_STRINGL(ret, size, 0); /* the string is already strdup()'ed */
} else {
- RETVAL_STRINGL("", 0, 1);
+ RETVAL_FALSE;
}
if ( s_free) {
efree(s_free);