Fix zbuffer empty string writes #303
Merged
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
When a zlib stream has avail_in == 0, it will deflate with a Z_BUF_ERROR to indicate that "no progress is possible". A zbuffer write with an empty string will trigger this condition, and the write call returns/raises an error/exception. The fix is simple: change the do/while to a while loop, so that it only tries to deflate if there is actually data to deflate.
Contributor
Author
|
The CI tests revealed that zbuffer.h was also missing some static inline keywords, bugs that have been present for a while but we didnt notice because we didnt have tests for the C interface to zbuffer. I fixed them as part of this pull request out of convenience, but if there's a strong preference to split that into a separate PR let me know. |
Contributor
|
Thank you for sending the PR! I appreciate your help. |
redboltz
added a commit
that referenced
this pull request
Jun 23, 2015
Fix zbuffer empty string writes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 pull request fixes msgpack::zbuffer::write and msgpack_zbuffer_write to handle empty strings correctly. Essentially the deflate call should be skipped entirely when there is no data to write, because it will return Z_BUFFER_ERROR and make the rest of the code think that something is wrong.
This fixes #291.