Skip to content

Use Error exceptions instead of warning in some place in string stdlib #4554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Use Error exceptions instead of warning in some place in string stdlib #4554

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1257d42
Use Error exceptions instead of warning in some place in string stdlib
Girgias Aug 17, 2019
1084c4e
Fix tests
Girgias Aug 17, 2019
0aefa92
Fix Win test
Girgias Aug 17, 2019
7e7af36
Use Error
Girgias Aug 18, 2019
18156c7
Promote warning to Error in str_word_count()
Girgias Aug 18, 2019
6aaa899
Possible regression test fix for bug73646
Girgias Aug 18, 2019
7f93c77
Fix opcache regression test for bug70207
Girgias Aug 18, 2019
099fcdf
Fix test expected output
Girgias Aug 18, 2019
96017b8
Normalizing question annotating comments
Girgias Aug 18, 2019
69ed5b6
Revert changes to strpos and strstr family as covered in another PR
Girgias Aug 18, 2019
56fe9eb
Fix Windows specific test
Girgias Aug 18, 2019
b449ff0
Fix compile
Girgias Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ext/mbstring/tests/bug73646.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ if (!function_exists('mb_ereg')) die('skip mbregex support not available');
?>
--FILE--
<?php

$v1=str_repeat("#", -1);
var_dump(mb_ereg_search_init($v1));
var_dump(mb_ereg_search_init(NULL));
?>
--EXPECTF--
Warning: str_repeat(): Second argument has to be greater than or equal to 0 in %sbug73646.php on line %d
--EXPECT--
Second argument has to be greater than or equal to 0
bool(true)
5 changes: 4 additions & 1 deletion ext/opcache/tests/bug70207.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ function bar() {
}
function foo() {
try { return bar(); }
finally { @str_repeat("foo", -10); }
finally {
try { @str_repeat("foo", -10); }
catch (\ErrorException $e) {}
}
}

var_dump(foo());
Expand Down
99 changes: 57 additions & 42 deletions ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,10 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) /
start = 0;
}
} else if ((size_t)start > ZSTR_LEN(s11)) {
/* Convert to Exception ?
zend_throw_error(NULL, "Offset not contained in string");
return;
*/
RETURN_FALSE;
}

Expand Down Expand Up @@ -324,15 +328,15 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) /
}
/* }}} */

/* {{{ proto int|false strspn(string str, string mask [, int start [, int len]])
/* {{{ proto int strspn(string str, string mask [, int start [, int len]])
Finds length of initial segment consisting entirely of characters found in mask. If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) */
PHP_FUNCTION(strspn)
{
php_spn_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, STR_STRSPN);
}
/* }}} */

/* {{{ proto int|false strcspn(string str, string mask [, int start [, int len]])
/* {{{ proto int strcspn(string str, string mask [, int start [, int len]])
Finds length of initial segment consisting entirely of characters not found in mask. If start or/and length is provide works like strcspn(substr($s,$start,$len),$bad_chars) */
PHP_FUNCTION(strcspn)
{
Expand Down Expand Up @@ -682,6 +686,9 @@ PHP_FUNCTION(nl_langinfo)
#endif
break;
default:
/* TODO Convert to ErrorException
* zend_throw_error(NULL, "");
*/
php_error_docref(NULL, E_WARNING, "Item '" ZEND_LONG_FMT "' is not valid", item);
RETURN_FALSE;
}
Expand Down Expand Up @@ -718,6 +725,7 @@ PHP_FUNCTION(strcoll)
* it needs to be incrementing.
* Returns: FAILURE/SUCCESS whether the input was correct (i.e. no range errors)
*/
/* TODO (maybe) convert docref errors into ErrorException? */
static inline int php_charmask(const unsigned char *input, size_t len, char *mask)
{
const unsigned char *end;
Expand Down Expand Up @@ -907,7 +915,7 @@ PHP_FUNCTION(ltrim)
}
/* }}} */

/* {{{ proto string|false wordwrap(string str [, int width [, string break [, bool cut]]])
/* {{{ proto string wordwrap(string str [, int width [, string break [, bool cut]]])
Wraps buffer to selected number of characters using string break char */
PHP_FUNCTION(wordwrap)
{
Expand All @@ -933,13 +941,13 @@ PHP_FUNCTION(wordwrap)
}

if (breakchar_len == 0) {
php_error_docref(NULL, E_WARNING, "Break string cannot be empty");
RETURN_FALSE;
zend_throw_error(NULL, "Break string cannot be empty");
return;
}

if (linelength == 0 && docut) {
php_error_docref(NULL, E_WARNING, "Can't force cut when width is zero");
RETURN_FALSE;
zend_throw_error(NULL, "Can't force cut when width is zero");
return;
}

/* Special case for a single-character break as it needs no
Expand Down Expand Up @@ -1129,7 +1137,7 @@ PHPAPI void php_explode_negative_limit(const zend_string *delim, zend_string *st
}
/* }}} */

/* {{{ proto array|false explode(string separator, string str [, int limit])
/* {{{ proto array explode(string separator, string str [, int limit])
Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */
PHP_FUNCTION(explode)
{
Expand All @@ -1145,8 +1153,8 @@ PHP_FUNCTION(explode)
ZEND_PARSE_PARAMETERS_END();

if (ZSTR_LEN(delim) == 0) {
php_error_docref(NULL, E_WARNING, "Empty delimiter");
RETURN_FALSE;
zend_throw_error(NULL, "Empty delimiter");
return;
}

array_init(return_value);
Expand Down Expand Up @@ -1619,7 +1627,7 @@ PHPAPI size_t php_dirname(char *path, size_t len)
}
/* }}} */

/* {{{ proto string|null dirname(string path[, int levels])
/* {{{ proto string dirname(string path[, int levels])
Returns the directory name component of the path */
PHP_FUNCTION(dirname)
{
Expand All @@ -1644,7 +1652,7 @@ PHP_FUNCTION(dirname)
ZSTR_LEN(ret) = zend_dirname(ZSTR_VAL(ret), str_len);
#endif
} else if (levels < 1) {
php_error_docref(NULL, E_WARNING, "Invalid argument, levels must be >= 1");
zend_throw_error(NULL, "Invalid argument, levels must be >= 1");
zend_string_efree(ret);
return;
} else {
Expand Down Expand Up @@ -1813,8 +1821,8 @@ PHP_FUNCTION(stristr)
ZEND_PARSE_PARAMETERS_END();

if (!ZSTR_LEN(needle)) {
php_error_docref(NULL, E_WARNING, "Empty needle");
RETURN_FALSE;
zend_throw_error(NULL, "Empty needle");
return;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we might be better off removing these errors entirely instead. There is nothing semantically wrong with an empty needle (it'll always match at the first position). It would remove an unnecessary special case.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working on it the various implementation of str*pos function family make it a bit awkward to do it in this PR (maybe?). So I will probably do this change separately and try to clean up a bit the implementations.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it would be best to do this in a separate PR.

}

haystack_dup = estrndup(ZSTR_VAL(haystack), ZSTR_LEN(haystack));
Expand Down Expand Up @@ -1854,8 +1862,8 @@ PHP_FUNCTION(strstr)
ZEND_PARSE_PARAMETERS_END();

if (!ZSTR_LEN(needle)) {
php_error_docref(NULL, E_WARNING, "Empty needle");
RETURN_FALSE;
zend_throw_error(NULL, "Empty needle");
return;
}

found = php_memnstr(ZSTR_VAL(haystack), ZSTR_VAL(needle), ZSTR_LEN(needle), ZSTR_VAL(haystack) + ZSTR_LEN(haystack));
Expand Down Expand Up @@ -1900,8 +1908,8 @@ PHP_FUNCTION(strpos)
}

if (!ZSTR_LEN(needle)) {
php_error_docref(NULL, E_WARNING, "Empty needle");
RETURN_FALSE;
zend_throw_error(NULL, "Empty needle");
return;
}

found = (char*)php_memnstr(ZSTR_VAL(haystack) + offset,
Expand Down Expand Up @@ -2194,8 +2202,8 @@ PHP_FUNCTION(chunk_split)
ZEND_PARSE_PARAMETERS_END();

if (chunklen <= 0) {
php_error_docref(NULL, E_WARNING, "Chunk length should be greater than zero");
RETURN_FALSE;
zend_throw_error(NULL, "Chunk length should be greater than zero");
return;
}

if ((size_t)chunklen > ZSTR_LEN(str)) {
Expand Down Expand Up @@ -2350,11 +2358,13 @@ PHP_FUNCTION(substr_replace)
(argc == 3 && Z_TYPE_P(from) == IS_ARRAY) ||
(argc == 4 && Z_TYPE_P(from) != Z_TYPE_P(len))
) {
/* TODO can convert to TypeError ? */
php_error_docref(NULL, E_WARNING, "'start' and 'length' should be of same type - numerical or array ");
RETURN_STR_COPY(Z_STR_P(str));
}
if (argc == 4 && Z_TYPE_P(from) == IS_ARRAY) {
if (zend_hash_num_elements(Z_ARRVAL_P(from)) != zend_hash_num_elements(Z_ARRVAL_P(len))) {
/* TODO can convert to Exception ? */
php_error_docref(NULL, E_WARNING, "'start' and 'length' should have the same number of elements");
RETURN_STR_COPY(Z_STR_P(str));
}
Expand Down Expand Up @@ -2424,6 +2434,7 @@ PHP_FUNCTION(substr_replace)
zend_tmp_string_release(tmp_repl_str);
RETURN_NEW_STR(result);
} else {
/* TODO can convert to Exception ? */
php_error_docref(NULL, E_WARNING, "Functionality of 'start' and 'length' as arrays is not implemented");
RETURN_STR_COPY(Z_STR_P(str));
}
Expand Down Expand Up @@ -3292,7 +3303,7 @@ PHPAPI zend_string *php_str_to_str(const char *haystack, size_t length, const ch
}
/* }}} */

/* {{{ proto string|false strtr(string str, string from[, string to])
/* {{{ proto string strtr(string str, string from[, string to])
Translates characters in str using given translation tables */
PHP_FUNCTION(strtr)
{
Expand All @@ -3310,8 +3321,8 @@ PHP_FUNCTION(strtr)
ZEND_PARSE_PARAMETERS_END();

if (ac == 2 && Z_TYPE_P(from) != IS_ARRAY) {
php_error_docref(NULL, E_WARNING, "The second argument is not an array");
RETURN_FALSE;
zend_type_error("The second argument is not an array");
return;
}

/* shortcut for empty string */
Expand Down Expand Up @@ -3359,6 +3370,7 @@ PHP_FUNCTION(strtr)
}
} else {
if (!try_convert_to_string(from)) {
zend_type_error("Cannot convert 'from' into string.");
return;
}

Expand Down Expand Up @@ -5363,7 +5375,7 @@ PHP_FUNCTION(str_repeat)
ZEND_PARSE_PARAMETERS_END();

if (mult < 0) {
php_error_docref(NULL, E_WARNING, "Second argument has to be greater than or equal to 0");
zend_throw_error(NULL, "Second argument has to be greater than or equal to 0");
return;
}

Expand Down Expand Up @@ -5401,7 +5413,7 @@ PHP_FUNCTION(str_repeat)
}
/* }}} */

/* {{{ proto array|string|false count_chars(string input [, int mode])
/* {{{ proto array|string count_chars(string input [, int mode])
Returns info about what characters are used in input */
PHP_FUNCTION(count_chars)
{
Expand All @@ -5421,8 +5433,8 @@ PHP_FUNCTION(count_chars)
ZEND_PARSE_PARAMETERS_END();

if (mymode < 0 || mymode > 4) {
php_error_docref(NULL, E_WARNING, "Unknown mode");
RETURN_FALSE;
zend_throw_error(NULL, "Unknown mode");
return;
}

buf = (const unsigned char *) ZSTR_VAL(input);
Expand Down Expand Up @@ -5610,8 +5622,8 @@ PHP_FUNCTION(substr_count)
ZEND_PARSE_PARAMETERS_END();

if (needle_len == 0) {
php_error_docref(NULL, E_WARNING, "Empty substring");
RETURN_FALSE;
zend_throw_error(NULL, "Empty substring");
return;
}

p = haystack;
Expand All @@ -5632,6 +5644,7 @@ PHP_FUNCTION(substr_count)
length += (haystack_len - offset);
}
if (length < 0 || ((size_t)length > (haystack_len - offset))) {
/* Convert to Exception ? */
php_error_docref(NULL, E_WARNING, "Invalid length value");
RETURN_FALSE;
}
Expand Down Expand Up @@ -5687,18 +5700,19 @@ PHP_FUNCTION(str_pad)
}

if (pad_str_len == 0) {
php_error_docref(NULL, E_WARNING, "Padding string cannot be empty");
zend_throw_error(NULL, "Padding string cannot be empty");
return;
}

if (pad_type_val < STR_PAD_LEFT || pad_type_val > STR_PAD_BOTH) {
php_error_docref(NULL, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
zend_throw_error(NULL,
"Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
return;
}

num_pad_chars = pad_length - ZSTR_LEN(input);
if (num_pad_chars >= INT_MAX) {
php_error_docref(NULL, E_WARNING, "Padding length is too long");
zend_throw_error(NULL, "Padding length is too long");
return;
}

Expand Down Expand Up @@ -5916,7 +5930,7 @@ PHP_FUNCTION(str_shuffle)
}
/* }}} */

/* {{{ proto mixed str_word_count(string str, [int format [, string charlist]])
/* {{{ proto array|int str_word_count(string str, [int format [, string charlist]])
Counts the number of words inside a string. If format of 1 is specified,
then the function will return an array containing all the words
found inside the string. If format of 2 is specified, then the function
Expand Down Expand Up @@ -5957,8 +5971,8 @@ PHP_FUNCTION(str_word_count)
/* nothing to be done */
break;
default:
php_error_docref(NULL, E_WARNING, "Invalid format value " ZEND_LONG_FMT, type);
RETURN_FALSE;
zend_throw_error(NULL, "Invalid format value " ZEND_LONG_FMT, type);
return;
}

if (char_list) {
Expand Down Expand Up @@ -6058,7 +6072,7 @@ PHP_FUNCTION(money_format)
/* }}} */
#endif

/* {{{ proto array|false str_split(string str [, int split_length])
/* {{{ proto array str_split(string str [, int split_length])
Convert a string to an array. If split_length is specified, break the string down into chunks each split_length characters long. */
PHP_FUNCTION(str_split)
{
Expand All @@ -6074,8 +6088,8 @@ PHP_FUNCTION(str_split)
ZEND_PARSE_PARAMETERS_END();

if (split_length <= 0) {
php_error_docref(NULL, E_WARNING, "The length of each segment must be greater than zero");
RETURN_FALSE;
zend_throw_error(NULL, "The length of each segment must be greater than zero");
return;
}


Expand Down Expand Up @@ -6114,8 +6128,8 @@ PHP_FUNCTION(strpbrk)
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

if (!ZSTR_LEN(char_list)) {
php_error_docref(NULL, E_WARNING, "The character list cannot be empty");
RETURN_FALSE;
zend_throw_error(NULL, "The character list cannot be empty");
return;
}

for (haystack_ptr = ZSTR_VAL(haystack); haystack_ptr < (ZSTR_VAL(haystack) + ZSTR_LEN(haystack)); ++haystack_ptr) {
Expand Down Expand Up @@ -6153,8 +6167,8 @@ PHP_FUNCTION(substr_compare)
if (len == 0) {
RETURN_LONG(0L);
} else {
php_error_docref(NULL, E_WARNING, "The length must be greater than or equal to zero");
RETURN_FALSE;
zend_throw_error(NULL, "The length must be greater than or equal to zero");
return;
}
}

Expand All @@ -6164,6 +6178,7 @@ PHP_FUNCTION(substr_compare)
}

if ((size_t)offset > ZSTR_LEN(s1)) {
/* Candidate to convert to Exception ? */
php_error_docref(NULL, E_WARNING, "The start position cannot exceed initial string length");
RETURN_FALSE;
}
Expand Down
10 changes: 6 additions & 4 deletions ext/standard/tests/strings/bug33605.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
Bug #33605 (substr_compare crashes)
--FILE--
<?php
$res = substr_compare("aa", "a", -99999999, -1, 0);
var_dump($res);
try {
substr_compare("aa", "a", -99999999, -1, 0);
} catch (\Error $e) {
echo $e->getMessage();
}

?>
--EXPECTF--
Warning: substr_compare(): The length must be greater than or equal to zero in %s on line %d
bool(false)
The length must be greater than or equal to zero
Loading