MFH: Fix #47231 (offsetGet error using incorrect offset)

diff --git a/NEWS b/NEWS
index 2b597d9279f4804bc2d72c627b40b89754bff32e..b3e815dbb21c40e22a38b0bbf3a0cb012c445d21 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ PHP                                                                        NEWS
 - Fixed bug #47320 ($php_errormsg out of scope in functions). (Dmitry)
 - Fixed bug #47265 (generating phar.phar fails because of safe_mode). (Greg)
 - Fixed bug #47243 (OCI8: Crash at shutdown on Windows) (Chris Jones/Oracle Corp.)
+- Fixed bug #47231 (offsetGet error using incorrect offset). (Etienne)
 - Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno)
 - Fixed bug #47085 (rename() returns true even if the file in PHAR does not
   exist). (Greg)

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 4ab0bba2c23e97877e7672077c55dd221a532968..3621648a9d3b69440d9e70acf608b23cffd03040 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -346,7 +346,7 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object,
                                zend_hash_index_find(ht, index, (void **) &retval);
                                return retval;
                        } else {
-                               zend_error(E_NOTICE, "Undefined offset:  %ld", Z_LVAL_P(offset));
+                               zend_error(E_NOTICE, "Undefined offset:  %ld", index);
                                return &EG(uninitialized_zval_ptr);
                        }
                } else {