mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4' into PHP-8.0

Browse Source 
* PHP-7.4:
  Fix #76167: mbstring may use pointer from some previous request
This commit is contained in:
Christoph M. Becker 2021-10-25 12:38:07 +02:00
commit 6e6a8443a8
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -10,6 +10,10 @@ PHP NEWS
. Fixed bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2).
(cmb)
- MBString:
. Fixed bug #76167 (mbstring may use pointer from some previous request).
(cmb, cataphract)
- Opcache:
. Fixed bug #81512 (Unexpected behavior with arrays and JIT). (Dmitry)

4
ext/mbstring/mbstring.c
View File

@ -4215,10 +4215,6 @@ static void php_mb_populate_current_detect_order_list(void)
const mbfl_encoding **entry = 0;
size_t nentries;
if (MBSTRG(current_detect_order_list)) {
return;
}
if (MBSTRG(detect_order_list) && MBSTRG(detect_order_list_size)) {
nentries = MBSTRG(detect_order_list_size);
entry = (const mbfl_encoding **)safe_emalloc(nentries, sizeof(mbfl_encoding*), 0);