Fix zlib missing handling of buffer error #6610
Merged
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
asterite
added
kind:bug
|
Probably fixes #4650 too... |
spec/std/zlib/reader_spec.cr
Outdated
| @@ -65,5 +65,15 @@ module Zlib | |||
| slice = Bytes.empty | |||
| reader.read(slice).should eq(0) | |||
| end | |||
|
|
|||
| it "should raise bufer error on error (#6575)" do | |||
straight-shoota
approved these changes
Aug 26, 2018
RX14
approved these changes
Aug 26, 2018
|
@asterite do you want do a rebase and squash that last commit or you prefer me to squash all together? |
asterite
force-pushed
the
bug/6575-zlib-buf-error
branch
from
5c314e0 to
a1d775f
Compare
|
@bcardiff Rebased against |
|
I ment that the last commit (typo) could be squashed into one of the previous ones. |
Closed
|
I like this fix, it at allows fibers to at least not hang now, sweet! I had some question marks about if it should retry on Z_BUF_ERROR if there's more input to be had but it can be addressed later, if it's even a problem, thanks! ref: http://zlib.net/zlib_how.html |
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.
Fixes #6575
The first commit fixes #6575: translating the code that reproduces the bug to ruby raises "buffer error", and we were missing handling that error. I additionally added a check for other potential errors too.
The next commits refactor and improve zilb, fixing a few bugs too, where a function would return
Intand it was expected to return anError(an enum). This was easily detected by using the question methods of enums instead of comparing them with enum values.Finally, peeking some Ruby code that deals with zlib, I found out about the
zErrorfunction to get a nice error message in case zlib's stream doesn't provide one.It might be nice to include this fix in 0.26.1 /cc @bcardiff