Fix #80933: SplFileObject::fgets() stops at NUL byte for DROP_NEW_LINE#6836
Closed
cmb69 wants to merge 6 commits intophp:PHP-7.4from
Closed
Fix #80933: SplFileObject::fgets() stops at NUL byte for DROP_NEW_LINE#6836cmb69 wants to merge 6 commits intophp:PHP-7.4from
cmb69 wants to merge 6 commits intophp:PHP-7.4from
Conversation
`buf` may contain NUL bytes, so we must not use `strcspn()` but rather the binary safe `php_strcspn()`. Signed-off-by: Christoph M. Becker <[email protected]>
`php_strcspn()` expects `char*`s prior to PHP 8.0.0. Signed-off-by: Christoph M. Becker <[email protected]>
We must not assume that either CR or LF are valid line endings, but should use `php_stream_locate_eol()` in the first place.
Member
Author
|
Like mentioned in the bug report, there is a more general issue regarding the detection of valid line endings. This should be addressed by my latest commit. |
nikic
reviewed
Apr 12, 2021
nikic
reviewed
Apr 13, 2021
Co-authored-by: Nikita Popov <[email protected]>
nikic
approved these changes
Apr 13, 2021
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
bufmay contain NUL bytes, so we must not usestrcspn()but ratherthe binary safe
php_strcspn().Signed-off-by: Christoph M. Becker [email protected]