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 
# Conflicts:
#	NEWS
This commit is contained in:
Go Kudo 2024-08-16 20:21:51 +00:00
commit d87fd356dc
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -9,6 +9,8 @@ PHP NEWS
15 Aug 2024, PHP 8.3.11 15 Aug 2024, PHP 8.3.11
- Core: - Core:
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
(zeriyoshi)
. Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c). . Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c).
(nielsdos) (nielsdos)
. Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos) . Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos)

11
Zend/zend_max_execution_timer.c
View file

@ -24,13 +24,14 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/types.h> #include <sys/types.h>
#include "zend.h"
#include "zend_globals.h"
#include "zend_portability.h"
#if __has_feature(memory_sanitizer) #if __has_feature(memory_sanitizer)
# include <sanitizer/msan_interface.h> # include <sanitizer/msan_interface.h>
#endif #endif
#include "zend.h"
#include "zend_globals.h"
// Musl Libc defines this macro, glibc does not // Musl Libc defines this macro, glibc does not
// According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417 // According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
# ifndef sigev_notify_thread_id # ifndef sigev_notify_thread_id
@ -53,8 +54,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
#if __has_feature(memory_sanitizer) #if __has_feature(memory_sanitizer)
/* MSan does not intercept timer_create() */ /* MSan does not intercept timer_create() */
__msan_unpoison(&EG(max_execution_timer_timer), __msan_unpoison(&EG(max_execution_timer_timer),
sizeof(EG(max_execution_timer_timer))); sizeof(EG(max_execution_timer_timer)));
#endif #endif
// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727 // Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727