From bb89a868c45716f5f9d202d946d6acfe7273731a Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Wed, 6 Sep 2006 12:07:27 +0000
Subject: [PATCH] do not search for empty strings with strpos() and strrpos()

---
 ext/iconv/iconv.c                  | 8 ++++++++
 ext/iconv/tests/iconv_strpos.phpt  | 5 +++++
 ext/iconv/tests/iconv_strrpos.phpt | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 152bbe25a0..433979f6ed 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1949,6 +1949,10 @@ PHP_FUNCTION(iconv_strpos)
 		RETURN_FALSE;
 	}
 
+	if (ndl_len < 1) {
+		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);
@@ -1984,6 +1988,10 @@ PHP_FUNCTION(iconv_strrpos)
 		RETURN_FALSE;
 	}
 
+	if (ndl_len < 1) {
+		RETURN_FALSE;
+	}
+
 	err = _php_iconv_strpos(&retval, haystk, haystk_len, ndl, ndl_len,
 	                        -1, charset); 
 	_php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC);
diff --git a/ext/iconv/tests/iconv_strpos.phpt b/ext/iconv/tests/iconv_strpos.phpt
index 5820b150ce..8cbed8d2aa 100644
--- a/ext/iconv/tests/iconv_strpos.phpt
+++ b/ext/iconv/tests/iconv_strpos.phpt
@@ -33,6 +33,9 @@ foo(str_repeat("abcab", 60)."abcdb".str_repeat("adabc", 60), "abcd", 0);
 foo(str_repeat("¤¢¤¤¤¦¤¨¤ª", 30)."¤¤¤¦¤ª¤¨¤¢".str_repeat("¤¢¤¤¤¨¤ª¤¦", 30), "¤¦¤ª", 0, "EUC-JP");
 $str = str_repeat("¤¢¤¤¤¦¤¨¤ª", 60).'$'.str_repeat("¤¢¤¤¤¨¤ª¤¦", 60);
 foo($str, '$', 0, "ISO-2022-JP", "EUC-JP");
+
+var_dump(iconv_strpos("string", ""));
+var_dump(iconv_strpos("", "string"));
 ?>
 --EXPECTF--
 2: %s
@@ -52,3 +55,5 @@ int(302)
 int(151)
 int(1)
 int(300)
+bool(false)
+bool(false)
diff --git a/ext/iconv/tests/iconv_strrpos.phpt b/ext/iconv/tests/iconv_strrpos.phpt
index c395834e55..37e62b136e 100644
--- a/ext/iconv/tests/iconv_strrpos.phpt
+++ b/ext/iconv/tests/iconv_strrpos.phpt
@@ -34,6 +34,9 @@ for ($i = 0; $i <=6; ++$i) {
 	$str = str_repeat("¤¢¤¤¤¦¤¨¤ª", 60).str_repeat('$', $i).str_repeat("¤¢¤¤¤¨¤ª¤¦", 60);
 	foo($str, '$', "ISO-2022-JP", "EUC-JP");
 }
+
+var_dump(iconv_strrpos("string", ""));
+var_dump(iconv_strrpos("", "string"));
 ?>
 --EXPECT--
 int(14)
@@ -56,3 +59,5 @@ int(605)
 int(304)
 int(606)
 int(305)
+bool(false)
+bool(false)
-- 
2.50.1