Improve socket cmsg space handling in sockets extension. #5387
Conversation
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
nikic
reviewed
Apr 14, 2020
ext/sockets/sendrecvmsg.c
Outdated
| size_t size = entry->size + n * entry->var_el_size; | ||
| size_t total_size = CMSG_SPACE(size); | ||
|
|
||
| if (entry->var_el_size > 0 |
There was a problem hiding this comment.
It would be better to make if (entry->var_el_size > 0) {} an outer if and move the code above inside it, to avoid the repeated and rather confusing check inside n_max.
There was a problem hiding this comment.
Done, and forced push, this indeed makes the code less confusing.
This should also fix the null pointer arithmetic warning on MacOS as we don't depend on whack code written by Apple.
Girgias
force-pushed
the
csmg-sockets-refactor
branch
from
d566c5a to
84d10d6
Compare
nikic
approved these changes
Apr 14, 2020
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.
This should also fix the null pointer arithmetic warning on MacOS as we don't depend on whack code written by Apple.
@nikic mind having a look at this?