From 0fd3572f4edbe7b3d9efdd212e214a9052dcfd01 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 21 Mar 2013 11:14:10 +0800 Subject: [PATCH] Fixed bug #64432 (more empty delimiter warning in strX methods) --- NEWS | 1 + ext/standard/string.c | 4 ++-- ext/standard/tests/strings/stristr_error.phpt | 4 ++-- ext/standard/tests/strings/strstr.phpt | Bin 10539 -> 10530 bytes 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 4e4557f880..d60fcb3517 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2013, PHP 5.4.14 - Core + . Fixed bug #64432 (more empty delimiter warning in strX methods). (Laruence) . Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error). (Dmitry) . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). diff --git a/ext/standard/string.c b/ext/standard/string.c index 42bf198175..77e0dff4c3 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1715,7 +1715,7 @@ PHP_FUNCTION(stristr) if (Z_TYPE_P(needle) == IS_STRING) { char *orig_needle; 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"); efree(haystack_dup); RETURN_FALSE; } @@ -1765,7 +1765,7 @@ PHP_FUNCTION(strstr) 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/stristr_error.phpt b/ext/standard/tests/strings/stristr_error.phpt index 831d93f4ec..2da35de735 100644 --- a/ext/standard/tests/strings/stristr_error.phpt +++ b/ext/standard/tests/strings/stristr_error.phpt @@ -50,11 +50,11 @@ NULL -- Testing stristr() function with empty haystack -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) -- Testing stristr() function with empty needle -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index 1c8d753e6587ab472b94b839a8cba6e02a0f4430..b135258f882e7daa4f120c8750a74153dc61a3a2 100644 GIT binary patch delta 52 vcmZ1-v?yppr5amaYHCVO>f}@Ea+?>ZDKbL&n@_2mz}P@Jc~+PFyi_g#6H^lC delta 69 zcmZ1!v^r=*r5a~SYEEWuW=U$%=6W@IMg(_qy_($Qdm2KM|H*Pr{;U2QRfdhrB|k5f F3joB88j%11 -- 2.50.1