summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Minor Typo in Commenthakre2015-04-271-1/+1
|
* Merge branch 'PHP-5.6'Xinchen Hui2015-04-141-1/+1
|\ | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * codes standardXinchen Hui2015-04-141-1/+1
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | * More fixes for bug #69152Stanislav Malyshev2015-04-111-0/+3
| | |
| * | Bump yearXinchen Hui2015-01-151-1/+1
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-05-111-1/+1
| |\ \ | | |/
| | * Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)Bob Weinand2014-05-111-1/+1
| | | | | | | | | | | | Linux apparently does not like memcpy in overlapping regions...
* | | Convert fatal errors into EngineExceptionDmitry Stogov2015-04-021-6/+9
| | |
* | | Use zend_error_noreturn() for fatal errorsDmitry Stogov2015-04-011-6/+6
| | |
* | | Fixed error messagesDmitry Stogov2015-03-201-1/+1
| | |
* | | Refactor error messages to only append defined in the event of rendering as ↵Anthony Ferrara2015-03-181-1/+6
| | | | | | | | | | | | a fatal error. Fix relative typehints to not work
* | | Refactor error implementation significantly to centralize error mode ↵Anthony Ferrara2015-03-181-1/+12
| | | | | | | | | | | | behavior. Add zend_internal_type_error() function
* | | Implement engine exceptionsDmitry Stogov2015-03-091-43/+128
| | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
* | | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-8/+22
| | | | | | | | | | | | Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-7/+7
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-75/+75
| | |
* | | Fixed compilation warningsDmitry Stogov2014-12-121-3/+3
| | |