cvs: php-src /ext/iconv iconv.c
| From: | Stanislav Malyshev | Date: | Thu, 20 Sep 2007 21:57:11 +0000 |
| Subject: | cvs: php-src /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46249@lists.php.net to get a copy of this message | ||
stas Thu Sep 20 21:57:11 2007 UTC
Modified files:
/php-src/ext/iconv iconv.c
Log:
MFB length check fix (Mattias Bengtsson)
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.154 php-src/ext/iconv/iconv.c:1.155
--- php-src/ext/iconv/iconv.c:1.154 Wed Sep 19 00:37:43 2007
+++ php-src/ext/iconv/iconv.c Thu Sep 20 21:57:11 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.154 2007/09/19 00:37:43 stas Exp $ */
+/* $Id: iconv.c,v 1.155 2007/09/20 21:57:11 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -765,7 +765,7 @@
}
}
- if (offset >= total_len) {
+ if (offset >= total_len || len > total_len) {
return PHP_ICONV_ERR_SUCCESS;
}