Merge branch 'PHP-7.2'

diff --cc NEWS
index 9f18ee0f1662691fd37fbd28108288934ee9c7c1,c6b1aea1f37529005301a24b57bbe05f4a052f9b..7855901c2e94348e2cb48314fbd4a44348827247
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -21,10 -20,13 +21,14 @@@ PH
    . Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to
      non-blocking). (Nikita)
  
 -- Opcache:
 -  . Fixed bug #76477 (Opcache causes empty return value).
 -    (Nikita, Laruence)
+ - mbstring:
+   . Fixed bug #76532 (Integer overflow and excessive memory usage
+     in mb_strimwidth). (MarcusSchwarz)
+ 
 +- PCRE:
 +  . Fixed bug #76512 (\w no longer includes unicode characters). (cmb)
 +  . Fixed bug #76514 (Regression in preg_match makes it fail with
 +    PREG_JIT_STACKLIMIT_ERROR). (Anatol)
  
  - phpdbg:
    . Fix arginfo wrt. optional/required parameters. (cmb)

diff --cc ext/mbstring/libmbfl/mbfl/mbfilter.c
index 94ecc574911ae9f5191fbba33d531d9a8adb09dd,35ca9d3b9c967894943a3b9f315a2e849d297ea3..48dbc75920987969baffc51aa23268c472125b26
--- 1/ext/mbstring/libmbfl/mbfl/mbfilter.c
--- 2/ext/mbstring/libmbfl/mbfl/mbfilter.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c
@@@ -1686,8 -1874,8 +1686,8 @@@ mbfl_strimwidth
        }
        mbfl_string_init(result);
        result->no_language = string->no_language;
 -      result->no_encoding = string->no_encoding;
 +      result->encoding = string->encoding;
-       mbfl_memory_device_init(&pc.device, width, 0);
+       mbfl_memory_device_init(&pc.device, MIN(string->len, width), 0);
  
        /* output code filter */
        pc.decoder = mbfl_convert_filter_new(

diff --cc ext/mbstring/libmbfl/mbfl/mbfilter.h
Simple merge