diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | UPGRADING | 5 | ||||
| -rw-r--r-- | ext/spl/php_spl.c | 8 | ||||
| -rw-r--r-- | ext/spl/tests/bug74372.phpt | 17 | ||||
| -rw-r--r-- | ext/spl/tests/spl_autoload_003.phpt | 1 | ||||
| -rw-r--r-- | ext/spl/tests/spl_autoload_012.phpt | 14 |
6 files changed, 32 insertions, 19 deletions
@@ -125,8 +125,10 @@ PHP NEWS - SPL: . Fixed bug #74977 (Appending AppendIterator leads to segfault). (Andrew Nester) - . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop). - (jhdxr) + . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach + loop). (jhdxr) + . Fixed bug #74372 (autoloading file with syntax error uses next autoloader, + may hide parse error). (Nikita) - SQLite3: . Updated bundled libsqlite to 3.21.0. (cmb) @@ -31,6 +31,11 @@ BCMath: . bcmul() and bcpow() now return numbers with the requested scale. Formerly, the returned numbers may have omitted trailing decimal zeroes. +SPL: + . If an SPL autoloader throws an exception, following autoloaders will not be + executed. Previously all autoloaders were executed and exceptions were + chained. + Standard: . getimagesize() and related functions now report the mime type of BMP images as image/bmp instead of image/x-ms-bmp, since the former has been registered diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 6b1426e701..fb9f80506b 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -447,16 +447,18 @@ PHP_FUNCTION(spl_autoload_call) } zend_call_function(&fci, &fcic); - - zend_exception_save(); zval_ptr_dtor(&retval); + + if (EG(exception)) { + break; + } + if (pos + 1 == SPL_G(autoload_functions)->nNumUsed || zend_hash_exists(EG(class_table), lc_name)) { break; } zend_hash_move_forward_ex(SPL_G(autoload_functions), &pos); } - zend_exception_restore(); zend_string_release(lc_name); SPL_G(autoload_running) = l_autoload_running; } else { diff --git a/ext/spl/tests/bug74372.phpt b/ext/spl/tests/bug74372.phpt new file mode 100644 index 0000000000..161238af0e --- /dev/null +++ b/ext/spl/tests/bug74372.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #74372: autoloading file with syntax error uses next autoloader, may hide parse error +--FILE-- +<?php + +spl_autoload_register(function($class) { + eval("ha ha ha"); +}); +spl_autoload_register(function($class) { + echo "Don't call me.\n"; +}); + +new Foo; + +?> +--EXPECTF-- +Parse error: syntax error, unexpected 'ha' (T_STRING) in %s on line %d diff --git a/ext/spl/tests/spl_autoload_003.phpt b/ext/spl/tests/spl_autoload_003.phpt index 7c0bd1a021..00fdd2734f 100644 --- a/ext/spl/tests/spl_autoload_003.phpt +++ b/ext/spl/tests/spl_autoload_003.phpt @@ -40,6 +40,5 @@ catch(Exception $e) --EXPECTF-- TestFunc1(TestClass) TestFunc2(TestClass) -TestFunc3(TestClass) Exception: Class TestClass missing ===DONE=== diff --git a/ext/spl/tests/spl_autoload_012.phpt b/ext/spl/tests/spl_autoload_012.phpt index 16389fa4fa..7b13b7105a 100644 --- a/ext/spl/tests/spl_autoload_012.phpt +++ b/ext/spl/tests/spl_autoload_012.phpt @@ -39,15 +39,10 @@ class_exists('ThisClassDoesNotExist'); ===DONE=== --EXPECTF-- autoload_first -autoload_second -second first autoload_first -autoload_second -second first autoload_first -autoload_second Fatal error: Uncaught Exception: first in %sspl_autoload_012.php:%d Stack trace: @@ -55,11 +50,4 @@ Stack trace: #1 [internal function]: spl_autoload_call('ThisClassDoesNo...') #2 %sspl_autoload_012.php(%d): class_exists('ThisClassDoesNo...') #3 {main} - -Next Exception: second in %sspl_autoload_012.php:%d -Stack trace: -#0 [internal function]: autoload_second('ThisClassDoesNo...') -#1 [internal function]: spl_autoload_call('ThisClassDoesNo...') -#2 %sspl_autoload_012.php(%d): class_exists('ThisClassDoesNo...') -#3 {main} - thrown in %sspl_autoload_012.php on line %d + thrown in %s on line %d |