Fixed an iconv_strrpos() bug that the function doesn't return accurate

position of last occurrence

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 3c32243c8341e1461745f382e64b781d90256b32..d461ca4f4d10254d9fd1f6127c6b0a368e82d49c 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -910,6 +910,9 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval,
                                ndl_buf_left -= GENERIC_SUPERSET_NBYTES;
                                if (ndl_buf_left == 0) {
                                        *pretval = match_ofs;
+                                       ndl_buf_p = ndl_buf;
+                                       ndl_buf_left = ndl_buf_len;
+                                       match_ofs = -1;
                                }
                        } else {
                                unsigned int i, j, lim;