Skip to content

Lazy objects: Update class constants earlier #15856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Lazy objects: Update class constants earlier #15856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions Zend/tests/lazy_objects/init_ast_const.phpt
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Zend/tests/lazy_objects/init_ast_const_failure.phpt
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions Zend/tests/lazy_objects/oss_fuzz_71407.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--TEST--
oss-fuzz #71407
--FILE--
<?php

class C {
public $x=x;
}

$reflector = new ReflectionClass(C::class);

try {
$obj = $reflector->newLazyGhost(function() {});
clone $obj;
} catch (Error $e) {
printf("%s: %s\n", $e::class, $e->getMessage());
}


?>
--EXPECT--
Error: Undefined constant "x"
21 changes: 9 additions & 12 deletions Zend/zend_lazy_objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,13 @@ ZEND_API zend_object *zend_object_make_lazy(zend_object *obj,
return NULL;
}

if (UNEXPECTED(!(reflection_ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
if (UNEXPECTED(zend_update_class_constants(reflection_ce) != SUCCESS)) {
ZEND_ASSERT(EG(exception));
return NULL;
}
}

obj = zend_objects_new(reflection_ce);

for (int i = 0; i < obj->ce->default_properties_count; i++) {
Expand Down Expand Up @@ -373,12 +380,7 @@ ZEND_API zend_object *zend_lazy_object_mark_as_initialized(zend_object *obj)

zend_class_entry *ce = obj->ce;

if (UNEXPECTED(!(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
if (UNEXPECTED(zend_update_class_constants(ce) != SUCCESS)) {
ZEND_ASSERT(EG(exception));
return NULL;
}
}
ZEND_ASSERT(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED);

zval *default_properties_table = CE_DEFAULT_PROPERTIES_TABLE(ce);
zval *properties_table = obj->properties_table;
Expand Down Expand Up @@ -568,12 +570,7 @@ ZEND_API zend_object *zend_lazy_object_init(zend_object *obj)

zend_class_entry *ce = obj->ce;

if (UNEXPECTED(!(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
if (UNEXPECTED(zend_update_class_constants(ce) != SUCCESS)) {
ZEND_ASSERT(EG(exception));
return NULL;
}
}
ZEND_ASSERT(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED);

if (zend_object_is_lazy_proxy(obj)) {
return zend_lazy_object_init_proxy(obj);
Expand Down