php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  Fixed bug #81631
This commit is contained in:
Nikita Popov
2021-11-17 16:06:50 +01:00
parent 6641e3b8f4 4d4fe7639f
commit 70cb37243e
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/bug81631.phpt
+14
View File
@@ -0,0 +1,14 @@
--TEST--
Bug #81631: ::class with dynamic class name may yield wrong line number
--FILE--
<?php
$a = 0;
var_dump($b::class);
?>
--EXPECTF--
Warning: Undefined variable $b in %s on line 3
Fatal error: Uncaught TypeError: Cannot use "::class" on value of type null in %s:3
Stack trace:
#0 {main}
thrown in %s on line 3
Zend/zend_vm_def.h
+1 -1
View File
@@ -8476,8 +8476,8 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, CV|TMPVAR|UNUSED|CLASS_FETCH, ANY)
USE_OPLINE
if (OP1_TYPE != IS_UNUSED) {
zval *op = GET_OP1_ZVAL_PTR(BP_VAR_R);
SAVE_OPLINE();
zval *op = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
Zend/zend_vm_execute.h
+3 -3
View File
@@ -14738,8 +14738,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_TMPVAR_H
USE_OPLINE
if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
zval *op = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
SAVE_OPLINE();
zval *op = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
@@ -31084,8 +31084,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_H
USE_OPLINE
if (IS_UNUSED != IS_UNUSED) {
zval *op = NULL;
SAVE_OPLINE();
zval *op = NULL;
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
@@ -38651,8 +38651,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_CV_HANDL
USE_OPLINE
if (IS_CV != IS_UNUSED) {
zval *op = _get_zval_ptr_cv_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC);
SAVE_OPLINE();
zval *op = _get_zval_ptr_cv_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC);
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {