pgproto3: hex-decode CopyData.Data in UnmarshalJSON#2569
Merged
Conversation
MarshalJSON encodes Data with hex.EncodeToString but UnmarshalJSON did
[]byte(msg.Data), so round-tripping any CopyData with non-text bytes
through JSON would silently corrupt the payload (e.g. [0x01 0x02 0xff]
came back as the literal bytes for the string "0102ff"). Now mirrors
the marshal side with hex.DecodeString, with the empty-Data shortcut
preserved so the existing TestJSONUnmarshalCopyData fixture still
unmarshals to []byte{}.
Added a round-trip test.
Signed-off-by: Charlie Tonneslan <cst0520@gmail.com>
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
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.
Spotted while reading pgproto3/copy_data.go. CopyData.MarshalJSON uses hex.EncodeToString on Data but UnmarshalJSON does
so any Data with non-printable bytes round-trips as the literal hex string back into the slice. e.g.
Now hex.DecodeString matches the marshal side. Kept the empty-Data shortcut so the existing TestJSONUnmarshalCopyData fixture (
{"Type":"CopyData"}-> []byte{}) still passes. Added a round-trip test that fails on master.