summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-10-221-2/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #73350 (Exception::__toString() cause circular references)
| * Fixed bug #73350 (Exception::__toString() cause circular references)Xinchen Hui2016-10-221-2/+3
| |
| * Revert "export symbol missing by phpdbg"Anatol Belski2016-10-131-0/+12
| | | | | | | | | | | | This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there
| * export symbol missing by phpdbgAnatol Belski2016-10-121-12/+0
| |
| * Fix bug #73190: memcpy negative parameter _bc_new_num_exStanislav Malyshev2016-10-121-5/+21
| | | | | | | | (cherry picked from commit 40e7baab3c90001beee4c8f0ed0ef79ad18ee0d6)
* | Revert "export symbol missing by phpdbg"Anatol Belski2016-10-141-0/+12
| | | | | | | | | | | | | | | | This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there (cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246)
* | fix another mistakeAnatol Belski2016-10-141-1/+1
| | | | | | | | (cherry picked from commit bec0121733cc5777c4d3fde8e9ff56fe68c039d3)
* | export symbol missing by phpdbgAnatol Belski2016-10-141-12/+0
| | | | | | | | (cherry picked from commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1)
* | fix wrong mergeAnatol Belski2016-10-141-4/+3
| | | | | | | | (cherry picked from commit 821a230f290b7457d4223001286afe00fe887277)
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-141-4/+21
| | | | | | | | | | | | | | * PHP-7.0: Fix bug #73190: memcpy negative parameter _bc_new_num_ex (cherry picked from commit af1bf873fe4fc70be17fa9f270e8f30666f2d2db)
* | Implement \ArgumentCountError exceptionDavey Shafik2016-08-301-1/+6
| |
* | Merge branch 'PHP-7.0'Nikita Popov2016-07-141-0/+2
|\ \ | |/ | | | | | | Conflicts: Zend/zend_vm_execute.h
| * Fix leak of class name when printing exception backtraceNikita Popov2016-07-141-0/+1
| |
| * Fix leak if throw_exception_object() failsNikita Popov2016-07-141-0/+1
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-07-121-2/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-7.0: Fixed bug #72581 (previous property undefined in Exception after deserialization) Conflicts: Zend/zend_exceptions.c
| * Fixed bug #72581 (previous property undefined in Exception after ↵Xinchen Hui2016-07-121-2/+1
| | | | | | | | deserialization)
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-06-221-2/+4
|\ \ | |/ | | | | | | * PHP-7.0: Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).
| * Allow "proxy" ovjects to substitute their class names through ↵Dmitry Stogov2016-06-221-2/+4
| | | | | | | | get_class_name() handler (similar to var_dump() and others).
* | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-211-1/+1
| | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | Intern some known (and offten used) strings.Dmitry Stogov2016-05-121-73/+92
| |
* | Fixed compilation warningsDmitry Stogov2016-04-291-4/+5
| |
* | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-1/+0
| | | | | | | | but is never used.
* | Merge zend_execute_data->called_scope into zend_execute_data->This.Dmitry Stogov2016-04-011-4/+8
| | | | | | | | | | | | | | "called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this. Now EG(This) may store IS_OBJECT + $this or IS_UNUSED + "called_scope" (of course, "called_scope" may be NULL). Some code might need to be adopted to support this change. Checks (Z_OBJ(EX(This))) might need to be converted into (Z_TYPE(EX(This)) == IS_OBJECT).
* | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-01-021-1/+1
|\ \ | |/
| * bump year which is missed in rev 49493a2Xinchen Hui2016-01-021-1/+1
| |
* | cleanupXinchen Hui2015-11-211-61/+8
|/
* Port the fix of 5.6 to 7.0Xinchen Hui2015-11-211-17/+18
|
* Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-11-201-1/+9
|\ | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * Fixed bug #70944 (try{ } finally{} can create infinite chains of exceptions)Xinchen Hui2015-11-201-1/+8
| |
* | Mark error and exception functions as "cold" (Matt's idea)Dmitry Stogov2015-08-191-7/+7
| |
* | 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
| | |
View Lorry Controller Status