php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 08:02:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #64432 (more empty delimiter warning in strX methods)

Browse Source
This commit is contained in:
Xinchen Hui
2013-03-21 11:14:10 +08:00
parent 0881ff0466
commit 0fd3572f4e
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/string.c
View File

@@ -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;
}

4
ext/standard/tests/strings/stristr_error.phpt
View File

@@ -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===

BIN
ext/standard/tests/strings/strstr.phpt
View File

Binary file not shown.