diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
| commit | 4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf (patch) | |
| tree | 3725689ea9e318ee1fc5ef34a6a83f62bc943802 /ext/mbstring/php_mbregex.c | |
| parent | 76d0e3d514ba47ad29c06e97efc16fef41e8186b (diff) | |
| parent | 0e3dede07c6677ed5cc60ddad3f7552f83b45a4b (diff) | |
| download | php-git-4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Happy new year (Update copyright to 2018)
Happy new year (Update copyright to 2018)
Revert "Enable ODBC tests on AppVeyor"
Enable ODBC tests on AppVeyor
Skip on Travis-CI
Extend skip section
2018
missing changelog entries + fix version and date
missing changelog entries
2018
Trailing whitespaces
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index ed98b10bc2..6aee8a46f7 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1447,7 +1447,7 @@ PHP_FUNCTION(mb_ereg_search_setpos) if ((position < 0) && (!Z_ISUNDEF(MBREX(search_str))) && (Z_TYPE(MBREX(search_str)) == IS_STRING)) { position += Z_STRLEN(MBREX(search_str)); } - + if (position < 0 || (!Z_ISUNDEF(MBREX(search_str)) && Z_TYPE(MBREX(search_str)) == IS_STRING && (size_t)position > Z_STRLEN(MBREX(search_str)))) { php_error_docref(NULL, E_WARNING, "Position is out of range"); MBREX(search_pos) = 0; |