tony2001 Wed Sep 6 12:07:27 2006 UTC
Modified files:
/php-src/ext/iconv iconv.c
/php-src/ext/iconv/tests iconv_strpos.phpt iconv_strrpos.phpt
Log:
do not search for empty strings with strpos() and strrpos()
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.139&r2=1.140&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.139 php-src/ext/iconv/iconv.c:1.140
--- php-src/ext/iconv/iconv.c:1.139 Thu Aug 31 11:17:37 2006
+++ php-src/ext/iconv/iconv.c Wed Sep 6 12:07:27 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.139 2006/08/31 11:17:37 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.140 2006/09/06 12:07:27 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1949,6 +1949,10 @@
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 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/iconv/tests/iconv_strpos.phpt
diff -u php-src/ext/iconv/tests/iconv_strpos.phpt:1.2
php-src/ext/iconv/tests/iconv_strpos.phpt:1.3
--- php-src/ext/iconv/tests/iconv_strpos.phpt:1.2 Wed Aug 17 14:01:03 2005
+++ php-src/ext/iconv/tests/iconv_strpos.phpt Wed Sep 6 12:07:27 2006
@@ -33,6 +33,9 @@
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(151)
int(1)
int(300)
+bool(false)
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/iconv/tests/iconv_strrpos.phpt
diff -u php-src/ext/iconv/tests/iconv_strrpos.phpt:1.2
php-src/ext/iconv/tests/iconv_strrpos.phpt:1.3
--- php-src/ext/iconv/tests/iconv_strrpos.phpt:1.2 Wed Aug 17 14:01:03 2005
+++ php-src/ext/iconv/tests/iconv_strrpos.phpt Wed Sep 6 12:07:27 2006
@@ -34,6 +34,9 @@
$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(304)
int(606)
int(305)
+bool(false)
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
