Skip to content

Stop at end of search string in TwoWaySearcher #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2023
+14 −1
Merged

Stop at end of search string in TwoWaySearcher #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/_StringProcessing/Algorithms/Searchers/TwoWaySearcher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ extension TwoWaySearcher: CollectionSearcher {
searched.formIndex(before: &lIndex)

if pattern[i] != searched[lIndex] {
searched.formIndex(&state.criticalIndex, offsetBy: period)
_ = searched.formIndex(
&state.criticalIndex,
offsetBy: period,
limitedBy: searched.endIndex)
if periodIsExact { state.memory = (pattern.count - period, end) }
return nil
}
Expand Down
10 changes: 10 additions & 0 deletions Tests/RegexTests/AlgorithmsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@ class AlgorithmTests: XCTestCase {
expectRanges("ababacabababa", "abababa", [6..<13])
expectRanges("ababacabababa", "aba", [0..<3, 6..<9, 10..<13])
}

// rdar://105154010
func testFirstRangeMissingCrash() {
let str = "%2$@ %#@AROUND_TIME@"
let target = "%@"
XCTAssertNil(str.firstRange(of: target))
XCTAssertNil(str.dropFirst().dropLast().firstRange(of: target))
XCTAssertNil(str.dropFirst().dropLast().firstRange(of: target[...]))
XCTAssertNil(str.firstRange(of: target[...]))
}

func testRegexSplit() {
func expectSplit(
Expand Down