summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix handling of throwing undef var in verify returnNikita Popov2020-10-134-9/+56
| | | | | | | | | | If we have an undefined variable and null is not accepted by the return type, we want to throw just the undef var error. In this case this lead to an infinite loop, because we overwrite the exception opline in SAVE_OPLINE and it does not get reset when chaining into a previous exception. Add an assertiong to catch this case earlier.
* Update ext/sodium parameter namesNikita Popov2020-10-134-119/+138
| | | | Closes GH-6279.
* Avoid useless register allocationDmitry Stogov2020-10-131-0/+1
|
* Update ext/phar parameter namesNikita Popov2020-10-139-131/+134
| | | | Closes GH-6307.
* Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-130-0/+0
|\ | | | | | | | | * PHP-7.4: 7.3.25 is next
| * Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-130-0/+0
| |\ | | | | | | | | | | | | * PHP-7.3: 7.3.25 is next
| | * 7.3.25 is nextChristoph M. Becker2020-10-134-6/+9
| | |
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-123-0/+15
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80226: imap_sort() leaks sortpgm memory
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-0/+15
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80226: imap_sort() leaks sortpgm memory
| | * Fix #80226: imap_sort() leaks sortpgm memoryChristoph M. Becker2020-10-123-0/+15
| | | | | | | | | | | | | | | | | | We need to free what we have allocated. Closes GH-6327.
* | | Perform trace range propagationDmitry Stogov2020-10-133-1/+43
| | |
* | | Change parameters types from int to boolChristoph M. Becker2020-10-126-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | These are typical boolean parameters, so we shouldn't advertize them as integers. For the `$reverse` parameter that even fixes expectations, because the `reverse` member is a bitfield of 1 bit, so assigning any even integer would not set it. Closes GH-6328.
* | | Eliminate dead storesDmitry Stogov2020-10-121-5/+10
| | |
* | | Improve parameter names in ext/intlMáté Kocsis2020-10-1254-512/+526
| | | | | | | | | | | | Closes GH-6309
* | | Improve parameter names in ext/pdo_sqliteMáté Kocsis2020-10-123-11/+11
| | | | | | | | | | | | Closes GH-6310
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-123-11/+44
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: intl: report more information about message pattern parse errors
| * | intl: report more information about message pattern parse errorsPhilip Hofstetter2020-10-123-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message patterns can be pretty complex, so reporting a generic U_PARSE_ERROR without any additional information makes it needlessly hard to fix erroneous patterns. This commit makes use of the additional UParseError* parameter to umsg_open to retrieve more details about the parse error to report that to the user via intl_get_error_message() Additional improve error reporting from the IntlMessage constructor. Previously, all possible failures when calling IntlMessage::__construct() would be masked away with a generic "Constructor failed" message. This would include invalid patterns. This commit makes sure that the underlying error that caused the constructor failure is reported as part of the IntlException error message. Closes GH-6325.
* | | Fixed bug #80225Nikita Popov2020-10-123-6/+20
| | | | | | | | | | | | | | | Namespaced and declares have a different interpretation of what "first statement" means.
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-123-9/+37
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80216: imap_mail_compose() does not validate types/encodings
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-9/+37
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80216: imap_mail_compose() does not validate types/encodings
| | * Fix #80216: imap_mail_compose() does not validate types/encodingsChristoph M. Becker2020-10-123-9/+37
| | | | | | | | | | | | | | | | | | | | | We need to check whether the given `type`s and `encoding`s are within bounds to avoid segfaults and out-of-bound reads. Closes GH-6323.
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-123-2/+21
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80223: imap_mail_compose() leaks envelope on malformed bodies
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-123-2/+21
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80223: imap_mail_compose() leaks envelope on malformed bodies
| | * Fix #80223: imap_mail_compose() leaks envelope on malformed bodiesChristoph M. Becker2020-10-123-2/+21
| | | | | | | | | | | | | | | | | | We have to clean up even on failure. Closes GH-6322.
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-122-1/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80220: imap_mail_compose() may leak memory
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-122-1/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80220: imap_mail_compose() may leak memory
| | * Fix #80220: imap_mail_compose() may leak memoryChristoph M. Becker2020-10-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unless `topbod` is of `TYPEMULTIPART`, `mail_free_body()` does not free the `nested.part`; while we could do this ourselves, instead we just ignore additional bodies in this case, i.e. we don't attach them in the first place. Closes GH-6321.
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-122-14/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Revert "Add missing X509 purpose constants"
| * | Revert "Add missing X509 purpose constants"Nikita Popov2020-10-122-14/+2
| | | | | | | | | | | | | | | | | | This reverts commit 1e53e14bc31aec98a408e517c7c8493ef4bf80cd. This fails on Travis.
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-122-2/+14
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Add missing X509 purpose constants
| * | Add missing X509 purpose constantsVincent JARDIN2020-10-122-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X509_PURPOSE_OCSP_HELPER, X509_PURPOSE_TIMESTAMP_SIGN are available from OpenSSL for many years: - X509_PURPOSE_OCSP_HELPER, since 2001 - X509_PURPOSE_TIMESTAMP_SIGN, since 2006 Also drop the ifdef check for X509_PURPOSE_ANY, as it is always available in supported OpenSSL versions. Closes GH-6312.
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-124-14/+44
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.4: Detect self-addition of array more accurately Deindirect source elements in zend_hash_merge
| * | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-10-124-14/+44
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.3: Detect self-addition of array more accurately Deindirect source elements in zend_hash_merge
| | * Detect self-addition of array more accuratelyNikita Popov2020-10-122-1/+11
| | | | | | | | | | | | | | | | | | | | | While the zvals may be different, they may still point to the same array. Fixes oss-fuzz #26245.
| | * Deindirect source elements in zend_hash_mergeNikita Popov2020-10-122-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | If the RHS has INDIRECT elements, we do not those to be added to the LHS verbatim. As we're using UPDATE_INDIRECT, we might even create a nested INDIRECT that way. This is a side-quest of oss-fuzz #26245.
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-121-0/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Backport schedule in yaml
| * | Backport schedule in yamlNikita Popov2020-10-121-0/+8
| | | | | | | | | | | | | | | I'm not sure it's needed, but let's try it: Add the scheduled builds on PHP-7.4 and PHP-8.0 as well, rather than just master.
* | | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-10-122-25/+40
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Avoid non-object in FE_FREE
| * | Avoid non-object in FE_FREENikita Popov2020-10-122-25/+40
| | | | | | | | | | | | | | | | | | Even if the properties HT is empty, make sure we still leave an object in the FE_RESET result, so our type inference results stay correct.
* | | XMLReader::open() and XMLReader::xml() are now staticChristoph M. Becker2020-10-111-0/+5
| | |
* | | Remove return types from XMLWriter stubsChristoph M. Becker2020-10-113-148/+277
| | | | | | | | | | | | | | | | | | These break BC, and as such we have to stick with docblock annotations. Closes GH-6319.
* | | Merge branch 'PHP-7.4' into PHP-8.0Derick Rethans2020-10-111-9/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.3' into PHP-7.4Derick Rethans2020-10-111-9/+7
| |\ \ | | |/
| | * Fixed test for bug #48097 due to confirmed data changes in timelibDerick Rethans2020-10-111-9/+7
| | |
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-103-1/+78
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80215: imap_mail_compose() may modify by-val parameters
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-103-1/+78
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80215: imap_mail_compose() may modify by-val parameters
| | * Fix #80215: imap_mail_compose() may modify by-val parametersChristoph M. Becker2020-10-103-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | We separate the input arrays and all sub-arrays to avoid modification of the passed parameters. This should be rewritten to use `zend_string`s for the "master" branch. Closes GH-6316.
* | | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-10-103-0/+28
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80213: imap_mail_compose() segfaults on certain $bodies
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-10-103-0/+28
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80213: imap_mail_compose() segfaults on certain $bodies
| | * Fix #80213: imap_mail_compose() segfaults on certain $bodiesChristoph M. Becker2020-10-103-0/+28
| | | | | | | | | | | | | | | | | | | | | We have to cater to non-associative arrays where the key may be `NULL`; we just skip these elements. Closes GH-6315.