Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit 5b8e941095a4 · 2023-05-25T11:01:58.000+02:00
* PHP-8.1:
  Access violation when ALLOC_FALLBACK fixed
diff --git a/NEWS b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 
 - Opcache:
   . Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
+  . Access violation on smm_shared_globals with ALLOC_FALLBACK. (KoudelkaB)
 
 - PCRE:
   . Fix preg_replace_callback_array() pattern validation. (ilutov)
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -192,6 +192,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
 	}
 #if ENABLE_FILE_CACHE_FALLBACK
 	if (ALLOC_FALLBACK == res) {
+		smm_shared_globals = NULL;
 		return ALLOC_FALLBACK;
 	}
 #endif
@@ -217,6 +218,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
 	}
 #if ENABLE_FILE_CACHE_FALLBACK
 	if (ALLOC_FALLBACK == res) {
+		smm_shared_globals = NULL;
 		return ALLOC_FALLBACK;
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`192`	`192`	`}`
`193`	`193`	`#if ENABLE_FILE_CACHE_FALLBACK`
`194`	`194`	`if (ALLOC_FALLBACK == res) {`
	`195`	`+ smm_shared_globals = NULL;`
`195`	`196`	`return ALLOC_FALLBACK;`
`196`	`197`	`}`
`197`	`198`	`#endif`
`@@ -217,6 +218,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`217`	`218`	`}`
`218`	`219`	`#if ENABLE_FILE_CACHE_FALLBACK`
`219`	`220`	`if (ALLOC_FALLBACK == res) {`
	`221`	`+ smm_shared_globals = NULL;`
`220`	`222`	`return ALLOC_FALLBACK;`
`221`	`223`	`}`
`222`	`224`	`#endif`