Skip to content

Fix GH-21687: assertion failure in zend_enum_fetch_case_name after array_walk #25

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
iliaal wants to merge 1 commit into from
Closed

Fix GH-21687: assertion failure in zend_enum_fetch_case_name after array_walk #25

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
18 changes: 18 additions & 0 deletions Zend/tests/gh21687.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
GH-21687 (Assertion failure in zend_enum_fetch_case_name after array_walk on enum)
--FILE--
<?php
enum Foo: int {
case Bar = 0;
}

$bar = Foo::Bar;
array_walk($bar, function($v) {});
var_dump($bar);
echo $bar->name . "\n";
echo $bar->value . "\n";
?>
--EXPECT--
enum(Foo::Bar)
Bar
0
6 changes: 5 additions & 1 deletion Zend/zend_enum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ static zend_always_inline zval *zend_enum_fetch_case_name(zend_object *zobj)
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);

zval *name = OBJ_PROP_NUM(zobj, 0);
ZVAL_DEREF(name);
ZEND_ASSERT(Z_TYPE_P(name) == IS_STRING);
return name;
}
Expand All @@ -77,7 +78,10 @@ static zend_always_inline zval *zend_enum_fetch_case_value(zend_object *zobj)
{
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);
ZEND_ASSERT(zobj->ce->enum_backing_type != IS_UNDEF);
return OBJ_PROP_NUM(zobj, 1);

zval *value = OBJ_PROP_NUM(zobj, 1);
ZVAL_DEREF(value);
return value;
}

END_EXTERN_C()
Expand Down
Loading