cvs: php4 /ext/mbstring mbstring.c
| From: | Moriyoshi Koizumi | Date: | Tue, 01 Apr 2003 11:49:30 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19925@lists.php.net to get a copy of this message | ||
moriyoshi Tue Apr 1 06:49:30 2003 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Fixed crash in mb_convert_encoding() that occurs when a void array is
passed as the third parameter
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.169 php4/ext/mbstring/mbstring.c:1.170
--- php4/ext/mbstring/mbstring.c:1.169 Thu Mar 27 22:38:13 2003
+++ php4/ext/mbstring/mbstring.c Tue Apr 1 06:49:30 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.169 2003/03/28 03:38:13 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.170 2003/04/01 11:49:30 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -1969,7 +1969,7 @@
zend_hash_move_forward(target_hash);
i--;
}
- if ( !strlen(_from_encodings)) {
+ if (_from_encodings != NULL && !strlen(_from_encodings)) {
efree(_from_encodings);
_from_encodings = NULL;
}