diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 13:59:13 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 14:03:40 +0200 |
| commit | a621023168ee00104dac20c996df3c9e8ad8edcf (patch) | |
| tree | 5ccc11d08a7631f8a32fc7faa3aeff02a1a6acbe /ext/mbstring/php_mbregex.c | |
| parent | 18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17 (diff) | |
| parent | 56cdaecb284b2b292ce1ecb076c1f8b041e47a02 (diff) | |
| download | php-git-a621023168ee00104dac20c996df3c9e8ad8edcf.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
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 95932e31ae..c86ea53ea1 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1272,7 +1272,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; |