Merge branch 'PHP-8.2'

iluuu1994 · iluuu1994 · commit 08e7366d0a09 · 2023-03-10T00:14:09.000+01:00
* PHP-8.2:
  Disable asan instrumentation for phpdbg_watchpoint_userfaultfd_thread
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
@@ -306,6 +306,9 @@ int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context) {
 }
 
 #ifdef HAVE_USERFAULTFD_WRITEFAULT
+# if defined(__GNUC__) && !defined(__clang__)
+__attribute__((no_sanitize_address))
+# endif
 void *phpdbg_watchpoint_userfaultfd_thread(void *phpdbg_globals) {
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
 	zend_phpdbg_globals *globals = (zend_phpdbg_globals *) phpdbg_globals;

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,9 @@ int phpdbg_watchpoint_segfault_handler(siginfo_t info, void context) {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`#ifdef HAVE_USERFAULTFD_WRITEFAULT`
	`309`	`+# if defined(__GNUC__) && !defined(__clang__)`
	`310`	`+__attribute__((no_sanitize_address))`
	`311`	`+# endif`
`309`	`312`	`void phpdbg_watchpoint_userfaultfd_thread(void phpdbg_globals) {`
`310`	`313`	`pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);`
`311`	`314`	`zend_phpdbg_globals globals = (zend_phpdbg_globals ) phpdbg_globals;`