Skip to content

Commit 6776e05

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Add exception check to zend_jit_fetch_obj_w_slow()
2 parents 5535741 + 6fd8808 commit 6776e05

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

ext/opcache/jit/zend_jit_helpers.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,10 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)
15681568
}
15691569
return;
15701570
}
1571+
if (UNEXPECTED(EG(exception))) {
1572+
ZVAL_ERROR(result);
1573+
return;
1574+
}
15711575
} else if (UNEXPECTED(Z_ISERROR_P(retval))) {
15721576
ZVAL_ERROR(result);
15731577
return;

0 commit comments

Comments
 (0)