EG(*) may be not initializd at this point - use CG(*).

dstogov · dstogov · commit 0bd17bd43890 · 2018-11-02T14:44:30.000+03:00
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3686,7 +3686,7 @@ static void preload_load(void)
 		Bucket *end = p + ZCSG(preload_script)->script.function_table.nNumUsed;
 
 		for (; p != end; p++) {
-			_zend_hash_append_ptr_ex(EG(function_table), p->key, Z_PTR(p->val), 1);
+			_zend_hash_append_ptr_ex(CG(function_table), p->key, Z_PTR(p->val), 1);
 		}
 	}
 
@@ -3695,14 +3695,19 @@ static void preload_load(void)
 		Bucket *end = p + ZCSG(preload_script)->script.class_table.nNumUsed;
 
 		for (; p != end; p++) {
-			_zend_hash_append_ptr_ex(EG(class_table), p->key, Z_PTR(p->val), 1);
+			_zend_hash_append_ptr_ex(CG(class_table), p->key, Z_PTR(p->val), 1);
 		}
 	}
 
-	EG(persistent_constants_count) = EG(zend_constants)->nNumUsed;
-	EG(persistent_functions_count) = EG(function_table)->nNumUsed;
-	EG(persistent_classes_count)   = EG(class_table)->nNumUsed;
-
+	if (EG(zend_constants)) {
+		EG(persistent_constants_count) = EG(zend_constants)->nNumUsed;
+	}
+	if (EG(function_table)) {
+		EG(persistent_functions_count) = EG(function_table)->nNumUsed;
+	}
+	if (EG(class_table)) {
+		EG(persistent_classes_count)   = EG(class_table)->nNumUsed;
+	}
 	CG(map_ptr_last) = ZCSG(map_ptr_last);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3686,7 +3686,7 @@ static void preload_load(void)`
`3686`	`3686`	`Bucket *end = p + ZCSG(preload_script)->script.function_table.nNumUsed;`
`3687`	`3687`
`3688`	`3688`	`for (; p != end; p++) {`
`3689`		`- _zend_hash_append_ptr_ex(EG(function_table), p->key, Z_PTR(p->val), 1);`
	`3689`	`+ _zend_hash_append_ptr_ex(CG(function_table), p->key, Z_PTR(p->val), 1);`
`3690`	`3690`	`}`
`3691`	`3691`	`}`
`3692`	`3692`
`@@ -3695,14 +3695,19 @@ static void preload_load(void)`
`3695`	`3695`	`Bucket *end = p + ZCSG(preload_script)->script.class_table.nNumUsed;`
`3696`	`3696`
`3697`	`3697`	`for (; p != end; p++) {`
`3698`		`- _zend_hash_append_ptr_ex(EG(class_table), p->key, Z_PTR(p->val), 1);`
	`3698`	`+ _zend_hash_append_ptr_ex(CG(class_table), p->key, Z_PTR(p->val), 1);`
`3699`	`3699`	`}`
`3700`	`3700`	`}`
`3701`	`3701`
`3702`		`- EG(persistent_constants_count) = EG(zend_constants)->nNumUsed;`
`3703`		`- EG(persistent_functions_count) = EG(function_table)->nNumUsed;`
`3704`		`- EG(persistent_classes_count) = EG(class_table)->nNumUsed;`
`3705`		`-`
	`3702`	`+ if (EG(zend_constants)) {`
	`3703`	`+ EG(persistent_constants_count) = EG(zend_constants)->nNumUsed;`
	`3704`	`+ }`
	`3705`	`+ if (EG(function_table)) {`
	`3706`	`+ EG(persistent_functions_count) = EG(function_table)->nNumUsed;`
	`3707`	`+ }`
	`3708`	`+ if (EG(class_table)) {`
	`3709`	`+ EG(persistent_classes_count) = EG(class_table)->nNumUsed;`
	`3710`	`+ }`
`3706`	`3711`	`CG(map_ptr_last) = ZCSG(map_ptr_last);`
`3707`	`3712`	`}`
`3708`	`3713`