]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorDmitry Stogov <dmitry@zend.com>
Mon, 1 Mar 2021 21:01:01 +0000 (00:01 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 1 Mar 2021 21:01:01 +0000 (00:01 +0300)
* PHP-8.0:
  Fixed bug #80802: (zend_jit_fetch_indirect_var assert failure with tracing JIT)

1  2 
ext/spl/spl_array.c

index 519e45a7689d208d98bfc64f54f317bc5495c562,76e9fbae2be93947bf25c029dca4eda8aee37be6..83e4f014a1ae8bea34ed510d3dbf57545f70cf82
@@@ -409,11 -362,11 +409,11 @@@ static zval *spl_array_get_dimension_pt
                                        retval = &EG(uninitialized_zval);
                                        break;
                                case BP_VAR_RW:
 -                                      zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, index);
 +                                      zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, key.h);
                                case BP_VAR_W: {
                                    zval value;
-                                       ZVAL_UNDEF(&value);
+                                       ZVAL_NULL(&value);
 -                                      retval = zend_hash_index_update(ht, index, &value);
 +                                      retval = zend_hash_index_update(ht, key.h, &value);
                           }
                        }
                }