From 39253a541819f2a5bb30cae4377d2a56fcbb7233 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 20 Sep 2007 22:38:25 +0000 Subject: [PATCH] better fix for iconv_substr --- ext/iconv/iconv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 2386bdebba..9e72811510 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -765,10 +765,14 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, } } - if (offset >= total_len || len > total_len) { + if(len > total_len) { + len = total_len; + } + + if (offset >= total_len) { return PHP_ICONV_ERR_SUCCESS; } - + if ((offset + len) > total_len) { /* trying to compute the length */ len = total_len - offset; -- 2.50.1