do not search for empty strings with strpos() and strrpos()

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 0564b731ac9bb2c54be2ed5a67c9149234f374d7..b86df00111e9357210e7a6ed61c345f48b3d67f4 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1946,6 +1946,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);
@@ -1981,6 +1985,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 ccf4ea74a781618b9189059837449e3a704ad136..6965f6fae185ca3136ee298a35c01c9cc7b86eab 100644 (file)
--- a/ext/iconv/tests/iconv_strpos.phpt
+++ b/ext/iconv/tests/iconv_strpos.phpt
@@ -31,6 +31,10 @@ 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
@@ -50,3 +54,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 f150f884228f2eb82d3ee07f6f98892b8d3f98ad..ee977f2c31388d01f297c3116294b80bbce67ecf 100644 (file)
--- a/ext/iconv/tests/iconv_strrpos.phpt
+++ b/ext/iconv/tests/iconv_strrpos.phpt
@@ -32,6 +32,10 @@ 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)
@@ -54,3 +58,5 @@ int(605)
 int(304)
 int(606)
 int(305)
+bool(false)
+bool(false)