Skip to content

Commit 7c75c61

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fix #76167: mbstring may use pointer from some previous request
2 parents 810cddd + 7fcf17c commit 7c75c61

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

ext/mbstring/mbstring.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4201,10 +4201,6 @@ static void php_mb_populate_current_detect_order_list(void)
42014201
const mbfl_encoding **entry = 0;
42024202
size_t nentries;
42034203

4204-
if (MBSTRG(current_detect_order_list)) {
4205-
return;
4206-
}
4207-
42084204
if (MBSTRG(detect_order_list) && MBSTRG(detect_order_list_size)) {
42094205
nentries = MBSTRG(detect_order_list_size);
42104206
entry = (const mbfl_encoding **)safe_emalloc(nentries, sizeof(mbfl_encoding*), 0);

0 commit comments

Comments
 (0)