mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #74372

Browse Source
This commit is contained in:
Nikita Popov 2017-12-06 23:32:39 +01:00
parent 4e6b80ca54
commit 9cdd547eca
6 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -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)

5
UPGRADING
View File

@ -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

8
ext/spl/php_spl.c
View File

@ -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 {

17
ext/spl/tests/bug74372.phpt Normal file
View File

@ -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

1
ext/spl/tests/spl_autoload_003.phpt
View File

@ -40,6 +40,5 @@ catch(Exception $e)
--EXPECTF--
TestFunc1(TestClass)
TestFunc2(TestClass)
TestFunc3(TestClass)
Exception: Class TestClass missing
===DONE===

14
ext/spl/tests/spl_autoload_012.phpt
View File

@ -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