archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Christoph M. Becker 2016-07-28 14:08:31 +02:00
commit 6aaef1ed34
4 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mbstring/php_mbregex.c
View file

@ -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;