Skip to content

Commit b8e9d79

Browse files
committed
fix oops
1 parent 6d0691a commit b8e9d79

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

Zend/zend_API.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,22 +1640,17 @@ static zend_always_inline void _object_properties_init(zend_object *object, zend
16401640
}
16411641
}
16421642
#endif
1643-
if (UNEXPECTED(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
1644-
// do {
1645-
// ZVAL_COPY_OR_DUP_PROP(dst, src);
1646-
// src++;
1647-
// dst++;
1648-
// } while (src != end);
1649-
// TODO: assertion?
1650-
/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
1651-
memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
1652-
} else {
1643+
if (EXPECTED(class_type->ce_flags & ZEND_ACC_HAS_RC_PROPS)) {
16531644
zval *end = src + class_type->default_properties_count;
16541645
do {
16551646
ZVAL_COPY_PROP(dst, src);
16561647
src++;
16571648
dst++;
16581649
} while (src != end);
1650+
} else {
1651+
// TODO: assertion?
1652+
/* zend_declare_typed_property() disallows refcounted default property values in internal classes */
1653+
memcpy(dst, src, sizeof(zval) * class_type->default_properties_count);
16591654
}
16601655
}
16611656
}

0 commit comments

Comments
 (0)