Fix MergeAPIExtensionsJSON panic on nil Raw bytes#110
Merged
harveyxia merged 1 commit intoreddit:mainfrom Apr 20, 2026
Merged
Conversation
When MergeAPIExtensionsJSON is called with (nil, nil), it returns
&apiextensionsv1.JSON{} with Raw: nil. If the result is then passed
back into MergeAPIExtensionsJSON (as happens when callers merge in a
loop over multiple inputs), the function attempts to json.Unmarshal
nil bytes, causing "unexpected end of JSON input".
Add len(Raw) > 0 guards before both json.Unmarshal calls so that
non-nil structs with nil or empty Raw are treated the same as nil
pointers. The nil+nil early return is preserved to avoid changing
the serialized form of existing callers' outputs.
harveyxia
approved these changes
Apr 20, 2026
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
3 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.
💸 TL;DR
When MergeAPIExtensionsJSON is called with (nil, nil), it returns &apiextensionsv1.JSON{} with Raw: nil. If the result is then passed back into MergeAPIExtensionsJSON (as happens when callers merge in a loop over multiple inputs), the function attempts to json.Unmarshal nil bytes, causing "unexpected end of JSON input".
Add len(Raw) > 0 guards before both json.Unmarshal calls so that non-nil structs with nil or empty Raw are treated the same as nil pointers. The nil+nil early return is preserved to avoid changing the serialized form of existing callers' outputs.
🧪 Testing Steps / Validation
Unit tests.
✅ Checks