Fix socket_export_stream() with wrong proto #12310
Closed
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
Girgias
reviewed
Sep 27, 2023
ext/sockets/sockets.c
Outdated
| @@ -2315,7 +2310,7 @@ PHP_FUNCTION(socket_export_stream) | |||
| * We don't want streams to actually *do* anything though, so don't give it | |||
| * anything apart from the protocol */ | |||
| if (protocol != NULL) { | |||
| stream = php_stream_xport_create(protocol, protocollen, 0, 0, NULL, NULL, NULL, NULL, NULL); | |||
| stream = php_stream_xport_create(protocol, strlen(protocol), 0, 0, NULL, NULL, NULL, NULL, NULL); | |||
There was a problem hiding this comment.
IMHO keeping the variable makes sense, as the compiler can elide the call to strlen() when the value is constant.
There was a problem hiding this comment.
This function is inherently "heavy", and it's not a high-frequency operation, the calculation of the text length of the protocol isn't a key factor affecting performance. Therefore, I have no preference for the way of calculation. In the new commit, I've added a const modifier to the protocol to avoid generating compile warnings and used sizeof(protocol - 1) to enhance readability and 100% ensure that it would be comfortable in terms of performance.
twose
force-pushed
the
fix_export_proto_8_1
branch
from
a32368e to
08ee346
Compare
devnexen
approved these changes
Sep 28, 2023
Girgias
approved these changes
Sep 28, 2023
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.
before
after