Skip to content

Fix OSS-Fuzz #478009707 for JIT #21151

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

Open
iluuu1994 wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+18 −2
Open

Fix OSS-Fuzz #478009707 for JIT #21151

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
6 changes: 5 additions & 1 deletion Zend/tests/oss-fuzz-478009707.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ $c = new C(1);
$c->prop = 1;
var_dump($c->prop);

$c->prop = PHP_INT_MAX;
var_dump($c->prop);

?>
--EXPECT--
--EXPECTF--
int(4)
float(%s)
14 changes: 13 additions & 1 deletion ext/opcache/jit/zend_jit_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2776,7 +2776,7 @@ static void ZEND_FASTCALL zend_jit_assign_obj_op_helper(zend_object *zobj, zend_
//??? } else {
//??? prop_info = zend_object_fetch_property_type_info(Z_OBJ_P(object), orig_zptr);
//??? }
if (prop_info) {
if (prop_info && ZEND_TYPE_IS_SET(prop_info->type)) {
/* special case for typed properties */
zend_jit_assign_op_to_typed_prop(zptr, prop_info, value, binary_op);
} else {
Expand Down Expand Up @@ -2972,6 +2972,9 @@ static void ZEND_FASTCALL zend_jit_pre_inc_obj_helper(zend_object *zobj, zend_st
}
} else {
zend_property_info *prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
fast_long_increment_function(prop);
Expand Down Expand Up @@ -3042,6 +3045,9 @@ static void ZEND_FASTCALL zend_jit_pre_dec_obj_helper(zend_object *zobj, zend_st
}
} else {
zend_property_info *prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
fast_long_decrement_function(prop);
Expand Down Expand Up @@ -3110,6 +3116,9 @@ static void ZEND_FASTCALL zend_jit_post_inc_obj_helper(zend_object *zobj, zend_s
ZVAL_NULL(result);
} else {
zend_property_info *prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
ZVAL_LONG(result, Z_LVAL_P(prop));
Expand Down Expand Up @@ -3171,6 +3180,9 @@ static void ZEND_FASTCALL zend_jit_post_dec_obj_helper(zend_object *zobj, zend_s
ZVAL_NULL(result);
} else {
zend_property_info *prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
if (prop_info && !ZEND_TYPE_IS_SET(prop_info->type)) {
prop_info = NULL;
}

if (EXPECTED(Z_TYPE_P(prop) == IS_LONG)) {
ZVAL_LONG(result, Z_LVAL_P(prop));
Expand Down
Loading