Merge branch 'PHP-8.2'

iluuu1994 · iluuu1994 · commit adb3d5240b20 · 2023-05-25T11:02:09.000+02:00
* PHP-8.2:
  Access violation when ALLOC_FALLBACK fixed
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -211,6 +211,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
@@ -236,6 +237,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
`@@ -211,6 +211,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`211`	`211`	`}`
`212`	`212`	`#if ENABLE_FILE_CACHE_FALLBACK`
`213`	`213`	`if (ALLOC_FALLBACK == res) {`
	`214`	`+ smm_shared_globals = NULL;`
`214`	`215`	`return ALLOC_FALLBACK;`
`215`	`216`	`}`
`216`	`217`	`#endif`
`@@ -236,6 +237,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`236`	`237`	`}`
`237`	`238`	`#if ENABLE_FILE_CACHE_FALLBACK`
`238`	`239`	`if (ALLOC_FALLBACK == res) {`
	`240`	`+ smm_shared_globals = NULL;`
`239`	`241`	`return ALLOC_FALLBACK;`
`240`	`242`	`}`
`241`	`243`	`#endif`