Fix growing destination buffer during WAL entry encoding #5079
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
| @@ -366,6 +366,13 @@ func (w *WriteWALEntry) Encode(dst []byte) ([]byte, error) { | |||
|
|
|||
| for k, v := range w.Values { | |||
|
|
|||
| // Make sure we have enough space in our buf before copying. If not, | |||
| // grow the buf. | |||
| if len(dst[:n])+2+len(k)+len(v)*8+4 > len(dst) { | |||
There was a problem hiding this comment.
So this change is because the buffer was insufficiently big for even the first batch, right?
There was a problem hiding this comment.
I would love to see these magic numbers const out.
The test to see if the destination buffer for encoding and decoding a WAL entry was broken and would cause a panic if there were large batches that would overflow the buffer size. Fixes #5075
|
OK, I checked out the branch, and generally follow it now. I'd like to understand @jwilder why you moved the earlier block, but I'm merging now. |
|
I had to rebase and force-push due to CHANGELOG conflicts. |
otoolep
added a commit
that referenced
this pull request
Dec 10, 2015
Fix growing destination buffer during WAL entry encoding
|
Cherry-picked to 0.9.6 |
Closed
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.
The test to see if the destination buffer for encoding and decoding a WAL
entry was broken and would cause a panic if there were large batches that
would overflow the buffer size.
Fixes #5075