[pull] master from php:master#1078
Merged
Merged
Conversation
Rewrite the PHP_ZIP_SET_FILE_COMMENT macro to solve this uaf that occurs after overwriting an existing entry and setting its inherited unchanged comment again. My solution is to simply add a if branch. I also add some defensive checks in the function by the way (ZEND_ASSERT(comment_len <= 0xffff);) just in case someone will re-use this helper in the future. Fixes #22649
* Add support for -1 as valid year for idate() output. Closes GH-13273 * Simplify error handling * Add note in UPGRADING.INTERNALS about API change
This is already done for string options in php_curl_option_str (see bug #68089). Similarly, array arguments should also not contain null bytes, so we throw the same error for these. This was extracted from #22651, as this seems less controversial. Using null bytes is clearly not supported and curl just throws away everything after the null byte, so https://wiki.php.net/rfc/policy-exempt-type-value-error-bc-policy seems to apply here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )