Fix findInArray misuse on MappingNodes in equality and contains#2645
Merged
mikefarah merged 1 commit intomikefarah:masterfrom Apr 6, 2026
Merged
Fix findInArray misuse on MappingNodes in equality and contains#2645mikefarah merged 1 commit intomikefarah:masterfrom
mikefarah merged 1 commit intomikefarah:masterfrom
Conversation
recurseNodeObjectEqual and containsObject both used findInArray to
locate keys in a MappingNode's Content array. findInArray steps by 1,
so it matches against both keys (even indices) and values (odd indices).
In recurseNodeObjectEqual, when a null key in the LHS matched a null
value in the RHS at the last position, rhs.Content[indexInRHS+1]
accessed an out-of-bounds index, causing a panic.
In containsObject, a %2 guard prevented the panic but introduced false
negatives: when a null value appeared before the actual null key,
findInArray returned the value's odd index, the guard rejected it, and
the function reported the key as missing.
Both functions now use findKeyInMap, which steps by 2 and compares only
key positions. The %2 guard in containsObject is removed.
Reproducer for the panic (recurseNodeObjectEqual):
echo '? [{~: ~}]
: v1
? [{2: ~}]
: v2' | yq '. += .'
Reproducer for the false negative (containsObject):
printf '? 1\n: ~\n? ~\n: x\n' | yq 'contains({~: "x"})'
Found by OSS-Fuzz via the lima project's FuzzEvaluateExpression target.
https://issues.oss-fuzz.com/issues/383860504
Signed-off-by: Jan Dubois <jan@jandubois.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
mikefarah
reviewed
Apr 6, 2026
| value := lhs.Content[index+1] | ||
|
|
||
| indexInRHS := findInArray(rhs, key) | ||
| indexInRHS := findKeyInMap(rhs, key) |
Owner
There was a problem hiding this comment.
Can't beleive I was doing this tbh - nice find!
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.
recurseNodeObjectEqualandcontainsObjectboth usedfindInArrayto locate keys in a MappingNode's Content array.findInArraysteps by 1, so it matches against both keys (even indices) and values (odd indices).In
recurseNodeObjectEqual, when a null key in the LHS matched a null value in the RHS at the last position,rhs.Content[indexInRHS+1]accessed an out-of-bounds index, causing a panic.In
containsObject, a%2guard prevented the panic but introduced false negatives: when a null value appeared before the actual null key,findInArrayreturned the value's odd index, the guard rejected it, and the function reported the key as missing.Both functions now use
findKeyInMap, which steps by 2 and compares only key positions. The%2guard incontainsObjectis removed.Reproducer for the panic (
recurseNodeObjectEqual):Reproducer for the false negative (
containsObject):Found by OSS-Fuzz via the lima project's FuzzEvaluateExpression target. https://issues.oss-fuzz.com/issues/383860504