com php-src: fix bad formatted "undefined offset" notice when key is negative: Zend/tests/array_offset.phpt Zend/zend_execut e.c

From: Date: Wed, 10 Jun 2015 20:18:23 +0000
Subject: com php-src: fix bad formatted "undefined offset" notice when key is negative: Zend/tests/array_offset.phpt Zend/zend_execut e.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87202@lists.php.net to get a copy of this message
Commit: fdda34e0bc13967be78bc04997d907d512ee8917 Author: Márcio Almada <marcio3w@gmail.com> Tue, 9 Jun 2015 03:56:34 -0300 Committer: Nikita Popov <nikic@php.net> Wed, 10 Jun 2015 22:18:23 +0200 Parents: 51dbf73954ae00588b8219a12e32cf05166c039f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fdda34e0bc13967be78bc04997d907d512ee8917 Log: fix bad formatted "undefined offset" notice when key is negative Changed paths: A Zend/tests/array_offset.phpt M Zend/zend_execute.c Diff: diff --git a/Zend/tests/array_offset.phpt b/Zend/tests/array_offset.phpt new file mode 100644 index 0000000..76c25f9 --- /dev/null +++ b/Zend/tests/array_offset.phpt @@ -0,0 +1,21 @@ +--TEST-- +Ensure "undefined offset" notice formats message corectly when undefined key is negative +--FILE-- +<?php + +[][-1]; +[][-1.1]; +(new ArrayObject)[-1]; +(new ArrayObject)[-1.1]; + +echo "Done\n"; +?> +--EXPECTF-- +Notice: Undefined offset: -1 in %s on line 3 + +Notice: Undefined offset: -1 in %s on line 4 + +Notice: Undefined offset: -1 in %s on line 5 + +Notice: Undefined offset: -1 in %s on line 6 +Done diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 40868f0..386ddf3 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1438,14 +1438,14 @@ num_index: if (retval == NULL) { switch (type) { case BP_VAR_R: - zend_error(E_NOTICE,"Undefined offset: " ZEND_ULONG_FMT, hval); + zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); /* break missing intentionally */ case BP_VAR_UNSET: case BP_VAR_IS: retval = &EG(uninitialized_zval); break; case BP_VAR_RW: - zend_error(E_NOTICE,"Undefined offset: " ZEND_ULONG_FMT, hval); + zend_error(E_NOTICE,"Undefined offset: " ZEND_LONG_FMT, hval); /* break missing intentionally */ case BP_VAR_W: retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval));

« previous php.cvs (#87202) next »