moriyoshi Fri Apr 4 04:07:03 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring mbfilter.c
Log:
MFH(r-1.55): added missing sanity check, which was causing segfault.
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.52.2.2 php4/ext/mbstring/mbfilter.c:1.52.2.3
--- php4/ext/mbstring/mbfilter.c:1.52.2.2 Mon Mar 24 16:22:57 2003
+++ php4/ext/mbstring/mbfilter.c Fri Apr 4 04:07:02 2003
@@ -80,7 +80,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.52.2.2 2003/03/24 21:22:57 moriyoshi Exp $ */
+/* $Id: mbfilter.c,v 1.52.2.3 2003/04/04 09:07:02 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -8138,6 +8138,13 @@
mbfl_string_init(result);
result->no_language = string->no_language;
result->no_encoding = string->no_encoding;
+
+ if (from > (int)string->len) {
+ result->len = 0;
+ result->val = mbfl_malloc(1);
+ result->val[0] = '\0';
+ return result;
+ }
if ((encoding->flag & (MBFL_ENCTYPE_SBCS | MBFL_ENCTYPE_WCS2BE |
MBFL_ENCTYPE_WCS2LE | MBFL_ENCTYPE_WCS4BE | MBFL_ENCTYPE_WCS4LE)) ||
encoding->mblen_table != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
