com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/mbstring/php_mbregex.c

Commit: 805dc0ea4790b8e3dda63ae5753de14823a09bde Author: Christoph M. Becker <cmb@php.net> Thu, 28 Jul 2016 15:24:41 +0200 Parents: a621023168ee00104dac20c996df3c9e8ad8edcf ee6900c3de68f1b94dfae8e230c7fa755c7fa595 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=805dc0ea4790b8e3dda63ae5753de14823a09bde Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/mbstring/php_mbregex.c Changed paths: MM NEWS MM ext/mbstring/php_mbregex.c Diff: diff --cc NEWS index 3fe60ff,44cd6e1..63ffcee --- a/NEWS +++ b/NEWS @@@ -61,16 -44,13 +61,18 @@@ PH - mbstring: . Fixed bug #72691 (mb_ereg_search raises a warning if a match zero-width). (cmb) - . Fixed Bug #72693 (mb_ereg_search increments search position when a match + . Fixed bug #72693 (mb_ereg_search increments search position when a match zero-width). (cmb) + . Fixed bug #72694 (mb_ereg_search_setpos does not accept a string's last + position). (cmb) +- Opcache: + . Fixed bug #72590 (Opcache restart with kill_all_lockers does not work). + (Keyur) + - PCRE: . Fixed bug #72688 (preg_match missing group names in matches). (cmb) + . Upgraded to PCRE 8.39. (Anatol) - PDO_pgsql: . Fixed bug #70313 (PDO statement fails to throw exception). (Matteo) diff --cc ext/mbstring/php_mbregex.c index c86ea53,9873a85...fc0b1d4 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@@ -1408,8 -1400,8 +1408,8 @@@ PHP_FUNCTION(mb_ereg_search_setpos return; } - 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 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && position > Z_STRLEN_P(MBREX(search_str)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Position is out of range"); ++ 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; }