Added offset validity check for iconv_strpos()

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index d6674c59cef13daf630d5bb8daa5856eb733d74b..3c32243c8341e1461745f382e64b781d90256b32 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1593,6 +1593,11 @@ PHP_FUNCTION(iconv_strpos)
                RETURN_FALSE;
        }
 
+       if (offset < 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
+               RETURN_FALSE;
+       }
+
        err = _php_iconv_strpos(&retval, haystk, haystk_len, ndl, ndl_len,
                                offset, charset); 
        _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);