diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 14:08:31 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 14:09:29 +0200 |
| commit | 6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73 (patch) | |
| tree | ed0c53b96864eb5fa4a148a61d80021e1bcaaada /ext/mbstring/php_mbregex.c | |
| parent | db69ea32cb283641eba86742de36d7eb9bd485ea (diff) | |
| parent | a621023168ee00104dac20c996df3c9e8ad8edcf (diff) | |
| download | php-git-6aaef1ed346fcc7f9dad58e47f6418d36c3cbe73.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
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 a361874729..3b5e857289 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1297,7 +1297,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) break; } end = MBREX(search_regs)->end[0]; - if (pos < end) { + if (pos <= end) { MBREX(search_pos) = end; } else { MBREX(search_pos) = pos + 1; |