Fixed bug #79252

nikic · nikic · commit 30ee3f48d404 · 2020-02-28T12:47:56.000+01:00
diff --git a/NEWS b/NEWS
@@ -56,6 +56,10 @@ PHP                                                                        NEWS
   . Fixed bug #79315 (ZipArchive::addFile doesn't honor start/length
     parameters). (Remi)
 
+- Opcache:
+  . Fixed bug #79252 (preloading causes php-fpm to segfault during exit).
+    (Nikita)
+
 20 Feb 2020, PHP 7.4.3
 
 - Core:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4233,9 +4233,11 @@ static void preload_load(void)
 		EG(persistent_classes_count)   = EG(class_table)->nNumUsed;
 	}
 	if (CG(map_ptr_last) != ZCSG(map_ptr_last)) {
+		size_t old_map_ptr_last = CG(map_ptr_last);
 		CG(map_ptr_last) = ZCSG(map_ptr_last);
 		CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);
 		CG(map_ptr_base) = perealloc(CG(map_ptr_base), CG(map_ptr_size) * sizeof(void*), 1);
+		memset(CG(map_ptr_base) + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4233,9 +4233,11 @@ static void preload_load(void)`
`4233`	`4233`	`EG(persistent_classes_count) = EG(class_table)->nNumUsed;`
`4234`	`4234`	`}`
`4235`	`4235`	`if (CG(map_ptr_last) != ZCSG(map_ptr_last)) {`
	`4236`	`+ size_t old_map_ptr_last = CG(map_ptr_last);`
`4236`	`4237`	`CG(map_ptr_last) = ZCSG(map_ptr_last);`
`4237`	`4238`	`CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);`
`4238`	`4239`	`CG(map_ptr_base) = perealloc(CG(map_ptr_base), CG(map_ptr_size) * sizeof(void*), 1);`
	`4240`	`+ memset(CG(map_ptr_base) + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));`
`4239`	`4241`	`}`
`4240`	`4242`	`}`
`4241`	`4243`