fix(macOS): validate cached find range before Replace#245
Draft
cursor[bot] wants to merge 1 commit into
Draft
Conversation
Replace Current used lastSearchHighlightRanges without checking that the range still covers the search string. After edits, reapplySearchHighlights skips out-of-bounds ranges but leaves stale in-bounds ranges in the cache, so Replace could corrupt unrelated text. Require bounds and a case-insensitive match before mutating. Adds FindReplaceSafetyTests regression coverage. Co-authored-by: Danny Peck <dannypeck@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
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.
Bug and impact
Replace in the in-note find bar used cached highlight
NSRanges without confirming the underlying text still matched the search query. After the user edits the note,reapplySearchHighlights()only skips out-of-bounds ranges when re-applying yellow backgrounds; it does not shrink or invalidate the cached array. A range can remain in bounds but point at the wrong substring (e.g. the old offset now spans"orld"instead of"test"). Replace would then substitute the replacement string into the wrong part of the document — silent data corruption with a plausible everyday trigger (find a word, edit earlier in the line, press Replace).Root cause
replaceCurrentMatchreadlastSearchHighlightRanges[focusIndex]and calledreplaceCharactersaftershouldChangeText, with no check thatstorage.string.substring(with: range)still matched the query.Fix
.caseInsensitive.Validation
FindReplaceSafetyTests.test_replaceCurrent_skipsWhenCachedRangeNoLongerContainsQuery, which reproduces the stale-offset scenario by applying highlights, mutating the prefix of the string viaNSTextStorage, then posting.replaceCurrentMatch; the document must stay unchanged.