summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Woops, accidentally made TS build fail...Bob Weinand2015-08-181-1/+0
| |
* | Revert fix for nicer truncation on log_errors_max_lenBob Weinand2015-08-181-1/+1
| |
* | Better fix for exception traces truncation with anon classesBob Weinand2015-08-181-4/+5
| |
* | Revert "Do not truncate exception traces upon anon class name"Dmitry Stogov2015-08-181-2/+2
| | | | | | | | This reverts commit b0c77fb80c9bceac37ec266f2d5a20131755c44a.
* | Do not truncate exception traces upon anon class nameBob Weinand2015-08-181-2/+2
| |
* | Executed file can be NULLNikita Popov2015-08-141-1/+1
| | | | | | | | So revert this part to what it was originally.
* | Fix leak in previous commitNikita Popov2015-08-141-3/+2
| | | | | | | | Turns out zend_update_property_str already does the copy implicitly.
* | Don't copy zend_strings during exception creationNikita Popov2015-08-141-2/+3
| | | | | | | | Minor optimization...
* | fix mergeStanislav Malyshev2015-08-041-4/+5
| |
* | fix mergeStanislav Malyshev2015-08-041-6/+5
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-1/+1
|\ \ | |/ | | | | | | * PHP-5.6: __wakeup doesn't have to be final
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-1/+1
| |\ | | | | | | | | | | | | * PHP-5.4: __wakeup doesn't have to be final
| | * __wakeup doesn't have to be finalStanislav Malyshev2015-08-041-1/+1
| | |
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-4/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: Zend/zend_exceptions.c ext/date/php_date.c ext/openssl/openssl.c ext/phar/phar_internal.h ext/soap/php_http.c ext/spl/spl_array.c ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/tests/serialize/bug69152.phpt sapi/cli/tests/005.phpt
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-8/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: .gitignore ext/date/php_date.c ext/spl/spl_array.c ext/spl/spl_observer.c
| | * Fix #69793 - limit what we accept when unserializing exceptionStanislav Malyshev2015-08-011-0/+28
| | |
| | * Fix bug #70121 (unserialize() could lead to unexpected methods execution / ↵Stanislav Malyshev2015-07-261-8/+9
| | | | | | | | | | | | NULL pointer deref)
| | * Fixed res leakXinchen Hui2015-04-141-3/+4
| | |
| * | Fixed res leakXinchen Hui2015-04-151-3/+4
| | |
* | | Switch code on thrown TypeError and ParseError to 0, update related testsAaron Piotrowski2015-07-071-2/+1
| | |
* | | Use NULL where possible for exception classAaron Piotrowski2015-07-071-3/+3
| | | | | | | | | | | | Matches usage of zend_throw_exception()/zend_throw_exception_ex().
* | | Remove need to pass error levelAaron Piotrowski2015-07-031-3/+3
| | |
* | | Enable throwing custom exceptions from errorsAaron Piotrowski2015-07-031-3/+3
| | |
* | | Switch position of ce in exception ce variable namesAaron Piotrowski2015-07-031-58/+58
| | |
* | | Cleanup exception ce APIAaron Piotrowski2015-07-031-78/+62
| | | | | | | | | | | | | | | Removed recently added functions to get Error ce's and marked the old functions fetching default_exception_ce and error_exception_ce as deprecated.
* | | Introduce ArithmeticErrorBob Weinand2015-07-021-1/+6
| | |
* | | Use DivisionByZeroError instead of exception for %/intdiv()Bob Weinand2015-07-021-0/+5
| | |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-28/+28
| | | | | | | | | | | | semantick changes).
* | | Improved zend_string API (Francois Laupretre)Dmitry Stogov2015-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods
* | | Show exception source in phpdbgBob Weinand2015-06-291-9/+14
| | |
* | | Fix bug when constructing an Error with invalid paramsAaron Piotrowski2015-06-171-4/+4
| | |
* | | cleanup unused varAnatol Belski2015-06-181-1/+0
| | |
* | | preserve the orig class name when extending the ErrorExceptionAnatol Belski2015-06-181-1/+8
| | |
* | | dont use function to fetch default exception ceAnatol Belski2015-06-181-1/+1
| | |
* | | fix crash when invalid exception arguments passedAnatol Belski2015-06-181-1/+8
| | |
* | | Fix #61362: Exception::getTraceAsString and ::__toString scramble UnicodeChristoph M. Becker2015-06-171-1/+1
| | | | | | | | | | | | | | | The logic in smart_str_append_escaped() relies on unsigned values of c, so we have to declare it as such.
* | | Rename interface macrosAaron Piotrowski2015-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed REGISTER_INTERFACE (formerly REGISTER_ITERATOR_INTERFACE) to REGISTER_MAGIC_INTERFACE and renamed REGISTER_ITERATOR_IMPLEMENT to REGISTER_MAGIC_IMPLEMENT. Both have now been moved to zend_interfaces.h.
* | | Move definition of Throwable to zend_exceptions.h/cAaron Piotrowski2015-06-151-0/+33
| | | | | | | | | | | | | | | Also moved REGISTER_ITERATOR_INTERFACE macro to zend_interfaces.h and renamed it to REGISTER_INTERFACE.
* | | Check for zend_ce_throwable insteadAaron Piotrowski2015-06-151-1/+1
| | |
* | | Fix previous exception type checkAaron Piotrowski2015-06-151-16/+16
| | |
* | | Update exception error messagesAaron Piotrowski2015-06-141-8/+8
| | |
* | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-141-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt
| * | | Fixed access to wrong opline (it may be the last ZEND_THROW in ↵Dmitry Stogov2015-05-201-1/+1
| | | | | | | | | | | | | | | | op_array->opcodes)
* | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-181-3/+4
|\ \ \ \ | |/ / /
| * | | 1. Fixed bug #69640 Unhandled EngineExceptions thrown from userland do not ↵Xinchen Hui2015-05-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | produce any output 2. Fixed Segfault introduced by latest changes
* | | | Merge exception formatting changes.Aaron Piotrowski2015-05-171-97/+98
|/ / /
* | | Display TypeExceptions like normal exceptionsNikita Popov2015-05-171-6/+8
| | | | | | | | | | | | | | | | | | | | | We currently don't show the argument at which the error actually occured in the trace - should probably either add it or don't display args on incomplete frames altogether, otherwise this'll probably be confusing.
* | | Tweak uncaught exception message displayNikita Popov2015-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* | | Display EngineExceptions like ordinary exceptionsNikita Popov2015-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
* | | Fix exception leak in interactive consoleNikita Popov2015-05-151-1/+2
| | | | | | | | | | | | | | | Shows up there because it throws at E_WARNING severity level and as such leak detection is not suppressed.