diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 15:35:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 15:50:41 +0200 |
| commit | de755310b49dbf06dd03f7bf54c4377c37c7306b (patch) | |
| tree | 22a9bf85e506ad0310d5e6b7845073ba2a008e29 /ext/mbstring/php_mbregex.c | |
| parent | 6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73 (diff) | |
| parent | 805dc0ea4790b8e3dda63ae5753de14823a09bde (diff) | |
| download | php-git-de755310b49dbf06dd03f7bf54c4377c37c7306b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
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 3b5e857289..fd103abf19 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1446,7 +1446,7 @@ PHP_FUNCTION(mb_ereg_search_setpos) 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)))) { + 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; RETURN_FALSE; |