Fixed bug #63943 (Bad warning text from strpos() on empty needle)

laruence · laruence · commit c05ee74e7ff2 · 2013-01-09T10:53:20.000+08:00
diff --git a/NEWS b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
   . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
     (Johannes)
 
+- Core
+  . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
+    (Laruence)
+
 - cURL extension:
   . Fixed bug (segfault due to libcurl connection caching). (Pierrick)
   . Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -1744,7 +1744,7 @@ PHP_FUNCTION(strpos)
 
 	if (Z_TYPE_P(needle) == IS_STRING) {
 		if (!Z_STRLEN_P(needle)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle");
 			RETURN_FALSE;
 		}
 
diff --git a/ext/standard/tests/strings/bug63943.phpt b/ext/standard/tests/strings/bug63943.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #63943 (Bad warning text from strpos() on empty needle)
+--FILE--
+<?php
+strpos("lllllll", '');
+?>
+--EXPECTF--
+Warning: strpos(): Empty needle in %sbug63943.php on line %d

Original file line number	Diff line number	Diff line change
`@@ -1744,7 +1744,7 @@ PHP_FUNCTION(strpos)`
`1744`	`1744`
`1745`	`1745`	`if (Z_TYPE_P(needle) == IS_STRING) {`
`1746`	`1746`	`if (!Z_STRLEN_P(needle)) {`
`1747`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");`
	`1747`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle");`
`1748`	`1748`	`RETURN_FALSE;`
`1749`	`1749`	`}`
`1750`	`1750`