Exclude NUL characters from OSStrings returned by getsockopt#2557
Merged
SteveLauC merged 3 commits intonix-rust:masterfrom Dec 8, 2024
Merged
Exclude NUL characters from OSStrings returned by getsockopt#2557SteveLauC merged 3 commits intonix-rust:masterfrom
SteveLauC merged 3 commits intonix-rust:masterfrom
Conversation
On FreeBSD, getsockopt appends a single NUL to the returned string. On Linux, it pads the entire buffer with NULs. But both of those behaviors may be version-dependent. Adjust GetOsString to handle any number of NUL characters.
SteveLauC
approved these changes
Dec 7, 2024
Member
SteveLauC
left a comment
SteveLauC
left a comment
There was a problem hiding this comment.
But both of those behaviors may be version-dependent.
So this is a defensive patch, but anyway, it harms nothing:)
SteveLauC
reviewed
Dec 7, 2024
Comment on lines
+1748
to
+1753
| if let Ok(cs) = CStr::from_bytes_until_nul(&v.as_mut()[0..len]) { | ||
| OsStr::from_bytes(cs.to_bytes()) | ||
| } else { | ||
| // The OS returned a non-NUL-terminated string | ||
| OsStr::from_bytes(&v.as_mut()[0..len]) | ||
| } |
Member
There was a problem hiding this comment.
Considering that this behavior is version-dependent, i.e., some contributors, with specific kernel versions, may find this check useless, perhaps we should document why we do this here 🤔
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
On FreeBSD, getsockopt appends a single NUL to the returned string. On Linux, it pads the entire buffer with NULs. But both of those behaviors may be version-dependent. Adjust GetOsString to handle any number of NUL characters.
What does this PR do
Checklist:
CONTRIBUTING.md