mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-15 16:24:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

better fix for iconv_substr

Browse Source
This commit is contained in:
Stanislav Malyshev 2007-09-20 22:38:25 +00:00
parent c891118ce9
commit 39253a5418
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/iconv/iconv.c
View File

@ -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; return PHP_ICONV_ERR_SUCCESS;
} }
if ((offset + len) > total_len) { if ((offset + len) > total_len) {
/* trying to compute the length */ /* trying to compute the length */
len = total_len - offset; len = total_len - offset;