Access violation when ALLOC_FALLBACK fixed

KoudelkaB · iluuu1994 · commit 8946b7b141ea · 2023-05-25T11:01:17.000+02:00
Close phpGH-11312
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)
 
 - Standard:
   . Fix access on NULL pointer in array_merge_recursive(). (ilutov)
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -191,6 +191,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
@@ -216,6 +217,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
`@@ -191,6 +191,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`191`	`191`	`}`
`192`	`192`	`#if ENABLE_FILE_CACHE_FALLBACK`
`193`	`193`	`if (ALLOC_FALLBACK == res) {`
	`194`	`+ smm_shared_globals = NULL;`
`194`	`195`	`return ALLOC_FALLBACK;`
`195`	`196`	`}`
`196`	`197`	`#endif`
`@@ -216,6 +217,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`216`	`217`	`}`
`217`	`218`	`#if ENABLE_FILE_CACHE_FALLBACK`
`218`	`219`	`if (ALLOC_FALLBACK == res) {`
	`220`	`+ smm_shared_globals = NULL;`
`219`	`221`	`return ALLOC_FALLBACK;`
`220`	`222`	`}`
`221`	`223`	`#endif`