[backport] Guard against disengaged optional in InTrackedMutationRecords (#1120) - #1388
Open
JasonLi314 wants to merge 4 commits into
Open
JasonLi314 wants to merge 4 commits into
JasonLi314 wants to merge 4 commits into
Conversation
…-io#1120) ConsumeTrackedMutatedAttribute may leave a tracked_mutated_records_ entry in place with attributes = std::nullopt (the "else" branch at index_schema.cc:1997-2008 moves the attribute map out and disengages the optional but does not erase the entry). A subsequent call to InTrackedMutationRecords on the same key would then dereference the empty optional via `attributes->find(...)`, which is UB. Under ASAN this surfaced as a SIGSEGV from absl's SwissTable iterator-generation guard during the backfill scan path, observed in CI on a fulltext test (test_proximity_predicate). The fix is a one-line has_value() check; the semantically correct return is false (no pending mutation for this key/identifier). Adds InTrackedMutationRecordsAfterConsumeNoCrash to document and lock in the contract. The test exercises the exact code path that crashed in CI but does not, by itself, reliably trigger the crash on the unfixed code: after a single track/consume cycle the moved-from flat_hash_map inside the optional has its generation_ptr_ reset to absl's static EmptyGeneration() sentinel, so the dereference happens to read valid memory. The production crash needed a more complex sequence (multi- mutation cycles plus concurrent backfill). The test still asserts the correct behavior and catches future regressions in the has_value() check or the consume/disengage sequence. Signed-off-by: Allen Samuels <allenss@amazon.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> (cherry picked from commit 5d95e4c) Signed-off-by: Jason Li <47095666+JasonLi314@users.noreply.github.com>
Signed-off-by: Jason Li <47095666+JasonLi314@users.noreply.github.com>
JasonLi314
marked this pull request as ready for review
September 14, 2026 04:01
|
Reviewers for this PR
Assigned automatically to the least-assigned members of the reviewer pools in |
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
…h after cherry pick Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> Signed-off-by: JasonLi314 <47095666+JasonLi314@users.noreply.github.com>
Signed-off-by: Jason Li <47095666+JasonLi314@users.noreply.github.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.
cherry picking commit
5d95e4c7to branch 1.1 that added reader guard to optional pending index updates.