mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix GH-19397: mb_list_encodings() can cause crashes on shutdown
This commit is contained in:
4
NEWS
4
NEWS
@@ -49,6 +49,10 @@ PHP NEWS
|
||||
. Fixed bug GH-19098 (libxml<2.13 segmentation fault caused by
|
||||
php_libxml_node_free). (nielsdos)
|
||||
|
||||
- MbString:
|
||||
. Fixed bug GH-19397 (mb_list_encodings() can cause crashes on shutdown).
|
||||
(nielsdos)
|
||||
|
||||
- Opcache:
|
||||
. Reset global pointers to prevent use-after-free in zend_jit_status().
|
||||
(Florian Engelhardt)
|
||||
|
||||
@@ -1166,8 +1166,8 @@ PHP_RSHUTDOWN_FUNCTION(mbstring)
|
||||
MBSTRG(outconv_state) = 0;
|
||||
|
||||
if (MBSTRG(all_encodings_list)) {
|
||||
GC_DELREF(MBSTRG(all_encodings_list));
|
||||
zend_array_destroy(MBSTRG(all_encodings_list));
|
||||
/* must be *array* release to remove from GC root buffer and free the hashtable itself */
|
||||
zend_array_release(MBSTRG(all_encodings_list));
|
||||
MBSTRG(all_encodings_list) = NULL;
|
||||
}
|
||||
|
||||
|
||||
11
ext/mbstring/tests/gh19397.phpt
Normal file
11
ext/mbstring/tests/gh19397.phpt
Normal file
@@ -0,0 +1,11 @@
|
||||
--TEST--
|
||||
GH-19397 (mb_list_encodings() can cause crashes on shutdown)
|
||||
--EXTENSIONS--
|
||||
mbstring
|
||||
--FILE--
|
||||
<?php
|
||||
$doNotDeleteThisVariableAssignment = mb_list_encodings();
|
||||
var_dump(count($doNotDeleteThisVariableAssignment) > 0);
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(true)
|
||||
Reference in New Issue
Block a user