Skip to content

Commit 0bd17bd

Browse files
committed
EG(*) may be not initializd at this point - use CG(*).
1 parent b610467 commit 0bd17bd

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3686,7 +3686,7 @@ static void preload_load(void)
36863686
Bucket *end = p + ZCSG(preload_script)->script.function_table.nNumUsed;
36873687

36883688
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);
36903690
}
36913691
}
36923692

@@ -3695,14 +3695,19 @@ static void preload_load(void)
36953695
Bucket *end = p + ZCSG(preload_script)->script.class_table.nNumUsed;
36963696

36973697
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);
36993699
}
37003700
}
37013701

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+
}
37063711
CG(map_ptr_last) = ZCSG(map_ptr_last);
37073712
}
37083713

0 commit comments

Comments
 (0)