From 3149fc7c40158c3485c9c2b2dc2b42c8052c1396 Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Fri, 3 Jan 2003 14:29:49 +0000 Subject: [PATCH] Added offset validity check for iconv_strpos() --- ext/iconv/iconv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index d6674c59ce..3c32243c83 100644 --- 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); -- 2.40.0