colder Thu Mar 19 03:01:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_array.c
/php-src NEWS
Log:
MFH: Fix #47231 (offsetGet error using incorrect offset)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.38&r2=1.71.2.17.2.13.2.39&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.38
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.39
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.38 Tue Jan 27 14:50:27 2009
+++ php-src/ext/spl/spl_array.c Thu Mar 19 03:01:37 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.38 2009/01/27 14:50:27 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.39 2009/03/19 03:01:37 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -346,7 +346,7 @@
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 {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.525&r2=1.2027.2.547.2.965.2.526&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.525
php-src/NEWS:1.2027.2.547.2.965.2.526
--- php-src/NEWS:1.2027.2.547.2.965.2.525 Thu Mar 19 02:45:17 2009
+++ php-src/NEWS Thu Mar 19 03:01:37 2009
@@ -31,6 +31,7 @@
- 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
