archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Reset global pointers to prevent use-after-free
This commit is contained in:
Niels Dossche 2025-07-30 09:23:12 +02:00
commit be9f1d3d56
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -30,6 +30,10 @@ PHP NEWS
. Fixed bug GH-19098 (libxml<2.13 segmentation fault caused by . Fixed bug GH-19098 (libxml<2.13 segmentation fault caused by
php_libxml_node_free). (nielsdos) php_libxml_node_free). (nielsdos)
- Opcache:
. Reset global pointers to prevent use-after-free in zend_jit_status().
(Florian Engelhardt)
- OpenSSL: - OpenSSL:
. Fixed bug GH-18986 (OpenSSL backend: incorrect RAND_{load,write}_file() . Fixed bug GH-18986 (OpenSSL backend: incorrect RAND_{load,write}_file()
return value check). (nielsdos, botovq) return value check). (nielsdos, botovq)

8
ext/opcache/jit/zend_jit.c
View file

@ -5101,6 +5101,14 @@ ZEND_EXT_API void zend_jit_shutdown(void)
#else #else
zend_jit_trace_free_caches(&jit_globals); zend_jit_trace_free_caches(&jit_globals);
#endif #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) static void zend_jit_reset_counters(void)