ext/ftp: preserve bare CR bytes in ftp_get() ASCII mode#22364
Open
iliaal wants to merge 1 commit into
Open
Conversation
In ASCII mode ftp_get() stripped every '\r' and emitted only a following '\n', dropping bare CR bytes not part of a CRLF sequence. Fold CRLF to LF but write a lone '\r' through unchanged, carrying a '\r' on the final byte of a read into the next read and flushing it at EOF, so the buffer boundary behaves the same as the in-buffer case. ftp_nb_get() already does this via the lastch carry in ftp_nb_continue_read().
ndossche
approved these changes
Jun 19, 2026
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.
In ASCII mode
ftp_get()stripped every\rand re-emitted only a following\n, dropping bare CRs that aren't part of a CRLF (ba\rrearrived asbare). It now folds CRLF to LF but writes a lone\rthrough unchanged, carries a\rlanding on the last byte of a read into the next read, and flushes it at EOF, so the boundary case matches the in-buffer case.ftp_nb_get()already did this via thelastchcarry inftp_nb_continue_read(). Follow-up to GH-22328, which fixed the out-of-bounds read in the same lookahead.