summaryrefslogtreecommitdiff
path: root/ext/opcache/zend_persist.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/opcache/zend_persist.c')
-rw-r--r--ext/opcache/zend_persist.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index 1a22f12b4d..ed05872993 100644
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -860,16 +860,20 @@ static void zend_persist_class_entry(zval *zv)
int i;
size_t size = sizeof(zend_property_info *) * ce->default_properties_count;
+ ZEND_ASSERT(ce->ce_flags & ZEND_ACC_LINKED);
if (ZCG(is_immutable_class)) {
- ce->properties_info_table = zend_shared_memdup_put(
+ ce->properties_info_table = zend_shared_memdup(
ce->properties_info_table, size);
} else {
- ce->properties_info_table = zend_shared_memdup_arena_put(
+ ce->properties_info_table = zend_shared_memdup_arena(
ce->properties_info_table, size);
}
for (i = 0; i < ce->default_properties_count; i++) {
- ce->properties_info_table[i] = zend_shared_alloc_get_xlat_entry(ce->properties_info_table[i]);
+ if (ce->properties_info_table[i]) {
+ ce->properties_info_table[i] = zend_shared_alloc_get_xlat_entry(
+ ce->properties_info_table[i]);
+ }
}
}