Repository navigation
Conversation
With MSG_TRUNC, recv() and recvfrom() can return the real length of the datagram, which may be larger than the requested size. Since PyBytesWriter_FinishWithSize() now rejects a size larger than the allocated one, this raised ValueError after the datagram had already been consumed. Return only the bytes actually received instead.
|
The following commit authors need to sign the Contributor License Agreement: |
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
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.
With
MSG_TRUNC, Linuxrecv(2)/recvfrom(2)return the real length of the datagram, which can be larger than the buffer. Since gh-157226,PyBytesWriter_FinishWithSize()rejects a size larger than the allocated one, sosock.recv(n, MSG_TRUNC)andsock.recvfrom(n, MSG_TRUNC)raiseValueErrorafter the datagram has already been consumed.This clamps the returned length to the requested size, so only the bytes actually received are returned (as suggested in gh-69121).
recv_into()andrecvfrom_into()are unchanged: they still return the value from the system call as is, which is the way to get the full datagram length.Tests: added
testRecvTruncandtestRecvFromTrunctoBasicUDPTest. On a Linux debug build they fail onmainwithValueError: size larger than allocated sizeand pass with this change; fulltest_socketpasses on Linux and macOS.