Binary support for saltpack commands #1727
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
| @@ -190,6 +188,10 @@ func (d *decoder) Read(p []byte) (int, error) { | |||
| d.nbuf -= numBytesToDecode | |||
| copy(d.buf[0:d.nbuf], d.buf[numBytesToDecode:numBytesToDecode+d.nbuf]) | |||
|
|
|||
| if ret == 0 && d.err == nil && len(p) != 0 { | |||
| return 0, io.EOF | |||
| } | |||
There was a problem hiding this comment.
Did this fix a bug you ran into?
There was a problem hiding this comment.
Patrick mentioned something about today on the slack channel.
There was a problem hiding this comment.
Yes, see slack and TestBinaryInput in armor_test.go
There was a problem hiding this comment.
There was an infinite loop without this.
|
Looks good to me apart from the printfs. |
|
Thanks, I just removed them. |
| if err == nil { | ||
| t.Errorf("Armor62Open worked on binary data: m == %x, hdr == %q, ftr == %q", m, hdr, ftr) | ||
| } | ||
| */ |
There was a problem hiding this comment.
I'm not crazy about this: Armor62Open with invalid data returns nil, "", "", nil.
Add test for Armor62Open on binary data infinite loop
patrickxb
force-pushed
the
patrickxb/CORE-2328
branch
from
4dace90 to
c6e3424
Compare
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.
r? @maxtaco @oconnor663