Commitc05ee74

committed

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

1 parent67c662a commitc05ee74Copy full SHA for c05ee74

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,10 @@ PHP NEWS`
`9`	`9`	`. Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).`
`10`	`10`	`(Johannes)`
`11`	`11`
	`12`	`+- Core`
	`13`	`+ . Fixed bug #63943 (Bad warning text from strpos() on empty needle).`
	`14`	`+ (Laruence)`
	`15`	`+`
`12`	`16`	`- cURL extension:`
`13`	`17`	`. Fixed bug (segfault due to libcurl connection caching). (Pierrick)`
`14`	`18`	`. Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for`

Lines changed: 1 addition & 1 deletion

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(NULLTSRMLS_CC,E_WARNING, "Emptydelimiter");`
	`1747`	`+php_error_docref(NULLTSRMLS_CC,E_WARNING, "Emptyneedle");`
`1748`	`1748`	`RETURN_FALSE;`
`1749`	`1749`	`}`
`1750`	`1750`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+--TEST--`
	`2`	`+Bug #63943 (Bad warning text from strpos() on empty needle)`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+strpos("lllllll",'');`
	`6`	`+?>`
	`7`	`+--EXPECTF--`
	`8`	`+Warning: strpos(): Empty needle in %sbug63943.php on line %d`

Comments

(0)