summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Kneuss <colder@php.net>2009-03-19 03:01:37 +0000
committerEtienne Kneuss <colder@php.net>2009-03-19 03:01:37 +0000
commit8623e9db8b1b774c6c7ec96832f34513521ea0fa (patch)
tree7b2900f1e0880bec98d7d7dec338c8e0552fff29
parentc44d7b357677220159ed7e7dc373d133f87ffb81 (diff)
downloadphp-git-8623e9db8b1b774c6c7ec96832f34513521ea0fa.tar.gz
MFH: Fix #47231 (offsetGet error using incorrect offset)
-rw-r--r--NEWS1
-rwxr-xr-xext/spl/spl_array.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2b597d9279..b3e815dbb2 100644
--- 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 4ab0bba2c2..3621648a9d 100755
--- 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 {