read: don't clear buffer when nothing can be read #739
Conversation
This file contains 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
This was referenced Apr 16, 2024
rhenium
requested changes
Apr 26, 2024
ext/openssl/ossl_ssl.c
Outdated
| @@ -1958,7 +1958,6 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock) | |||
| else | |||
| rb_str_modify_expand(str, ilen - RSTRING_LEN(str)); | |||
| } | |||
| rb_str_set_len(str, 0); | |||
| if (ilen == 0) | |||
| return str; | |||
There was a problem hiding this comment.
str needs to be cleared here, when trying to read zero bytes (ilen == 0)
There was a problem hiding this comment.
Ah good catch. This wasn't called by the test because OpenSSL::Buffering just returns early if size == 0.
But I fixed it in case it's sometimes used without the buffering.
|
Good catch! I didn't know about this behavior on IO. |
To be consistent with regular Ruby IOs: ```ruby r, _ = IO.pipe buf = "garbage".b r.read_nonblock(10, buf, exception: false) # => :wait_readable p buf # => "garbage" ``` Ref: redis-rb/redis-client@98b8944
casperisfine
force-pushed
the
read-clear-buffer
branch
from
eae4736
to
0845299
Compare
|
@rhenium thanks for the review and sorry for the delay, I was in vacation. Should be good to go now. |
rhenium
approved these changes
May 5, 2024
|
Yes, it looks good to me now. Thank you! |
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.
To be consistent with regular Ruby IOs:
Ref: redis-rb/redis-client@98b8944