Skip to content

Commit 976f569

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fixed bug #81631
2 parents aaba000 + 70cb372 commit 976f569

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

Zend/tests/bug81631.phpt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--TEST--
2+
Bug #81631: ::class with dynamic class name may yield wrong line number
3+
--FILE--
4+
<?php
5+
$a = 0;
6+
var_dump($b::class);
7+
?>
8+
--EXPECTF--
9+
Warning: Undefined variable $b in %s on line 3
10+
11+
Fatal error: Uncaught TypeError: Cannot use "::class" on value of type null in %s:3
12+
Stack trace:
13+
#0 {main}
14+
thrown in %s on line 3

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8517,8 +8517,8 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, CV|TMPVAR|UNUSED|CLASS_FETCH, ANY)
85178517
USE_OPLINE
85188518

85198519
if (OP1_TYPE != IS_UNUSED) {
8520-
zval *op = GET_OP1_ZVAL_PTR(BP_VAR_R);
85218520
SAVE_OPLINE();
8521+
zval *op = GET_OP1_ZVAL_PTR(BP_VAR_R);
85228522
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
85238523
ZVAL_DEREF(op);
85248524
if (Z_TYPE_P(op) != IS_OBJECT) {

Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14753,8 +14753,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_TMPVAR_H
1475314753
USE_OPLINE
1475414754

1475514755
if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
14756-
zval *op = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
1475714756
SAVE_OPLINE();
14757+
zval *op = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
1475814758
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
1475914759
ZVAL_DEREF(op);
1476014760
if (Z_TYPE_P(op) != IS_OBJECT) {
@@ -31197,8 +31197,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_H
3119731197
USE_OPLINE
3119831198

3119931199
if (IS_UNUSED != IS_UNUSED) {
31200-
zval *op = NULL;
3120131200
SAVE_OPLINE();
31201+
zval *op = NULL;
3120231202
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
3120331203
ZVAL_DEREF(op);
3120431204
if (Z_TYPE_P(op) != IS_OBJECT) {
@@ -38779,8 +38779,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_CV_HANDL
3877938779
USE_OPLINE
3878038780

3878138781
if (IS_CV != IS_UNUSED) {
38782-
zval *op = _get_zval_ptr_cv_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC);
3878338782
SAVE_OPLINE();
38783+
zval *op = _get_zval_ptr_cv_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC);
3878438784
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
3878538785
ZVAL_DEREF(op);
3878638786
if (Z_TYPE_P(op) != IS_OBJECT) {

0 commit comments

Comments
 (0)