mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Reset global pointers to prevent use-after-free
This commit is contained in:
commit
6fda0a5617
2 changed files with 12 additions and 0 deletions
4
NEWS
4
NEWS
|
@ -33,6 +33,10 @@ PHP NEWS
|
|||
. Fixed bug GH-19098 (libxml<2.13 segmentation fault caused by
|
||||
php_libxml_node_free). (nielsdos)
|
||||
|
||||
- Opcache:
|
||||
. Reset global pointers to prevent use-after-free in zend_jit_status().
|
||||
(Florian Engelhardt)
|
||||
|
||||
- OpenSSL:
|
||||
. Fixed bug GH-18986 (OpenSSL backend: incorrect RAND_{load,write}_file()
|
||||
return value check). (nielsdos, botovq)
|
||||
|
|
|
@ -3717,6 +3717,14 @@ void zend_jit_shutdown(void)
|
|||
#else
|
||||
zend_jit_trace_free_caches(&jit_globals);
|
||||
#endif
|
||||
|
||||
/* Reset global pointers to prevent use-after-free in `zend_jit_status()`
|
||||
* after gracefully restarting Apache with mod_php, see:
|
||||
* https://github.com/php/php-src/pull/19212 */
|
||||
dasm_ptr = NULL;
|
||||
dasm_buf = NULL;
|
||||
dasm_end = NULL;
|
||||
dasm_size = 0;
|
||||
}
|
||||
|
||||
static void zend_jit_reset_counters(void)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue