fix: double-resume of checked continuation in ScreenTextExtractor.extractText(from:) crashes app on tiny OCR screenshots #698
+133
−21
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import CoreGraphics | ||
| import XCTest | ||
| @testable import Cotabby | ||
|
|
||
| /// Direct tests for the Vision-backed OCR service boundary. | ||
| /// | ||
| /// Screenshot-context tests usually stub OCR so they can focus on orchestration. This file exists | ||
| /// separately because the crash happened inside `ScreenTextExtractor`'s callback-to-async bridge, | ||
| /// which only runs when the real Vision request path is exercised. | ||
| final class ScreenTextExtractorTests: XCTestCase { | ||
| func test_extractText_tinyImagesReturnNoRecognizedTextWithoutCrashing() async throws { | ||
| let extractor = ScreenTextExtractor() | ||
|
|
||
| for dimension in [1, 2] { | ||
| let image = try makeSolidImage(width: dimension, height: dimension) | ||
| await assertNoRecognizedText(from: image, extractor: extractor) | ||
| } | ||
|
Comment on lines
+14
to
+17
Contributor
There was a problem hiding this comment.
The guard threshold is Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! |
||
| } | ||
|
|
||
| func test_extractText_blankNormalImageReturnsNoRecognizedText() async throws { | ||
| let image = try makeSolidImage(width: 128, height: 128) | ||
|
|
||
| await assertNoRecognizedText(from: image, extractor: ScreenTextExtractor()) | ||
| } | ||
|
|
||
| private func assertNoRecognizedText( | ||
| from image: CGImage, | ||
| extractor: ScreenTextExtractor, | ||
| file: StaticString = #filePath, | ||
| line: UInt = #line | ||
| ) async { | ||
| do { | ||
| _ = try await extractor.extractText(from: image) | ||
| XCTFail("Expected OCR to report no recognized text.", file: file, line: line) | ||
| } catch ScreenTextExtractionError.noRecognizedText { | ||
| // Expected: blank or degenerate screenshots should be treated as unavailable context. | ||
| } catch { | ||
| XCTFail("Expected noRecognizedText, got \(error).", file: file, line: line) | ||
| } | ||
| } | ||
|
|
||
| private func makeSolidImage(width: Int, height: Int) throws -> CGImage { | ||
| let colorSpace = CGColorSpaceCreateDeviceRGB() | ||
| let context = try XCTUnwrap( | ||
| CGContext( | ||
| data: nil, | ||
| width: width, | ||
| height: height, | ||
| bitsPerComponent: 8, | ||
| bytesPerRow: width * 4, | ||
| space: colorSpace, | ||
| bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue | ||
| ) | ||
| ) | ||
| context.setFillColor(CGColor(gray: 1, alpha: 1)) | ||
| context.fill(CGRect(x: 0, y: 0, width: width, height: height)) | ||
| return try XCTUnwrap(context.makeImage()) | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OCRContinuationResumermissing@unchecked SendableOCRContinuationResumeris captured by reference inside aDispatchQueue.global(qos:).asyncclosure, which requires its captured values to beSendablein Swift 5.7+ with-strict-concurrency. The class usesNSLockto protect all mutable state, so it is safe for concurrent access, but without declaring@unchecked Sendableit may produce a warning (or error under stricter project settings) like "capture of 'resumer' with non-sendable type 'OCRContinuationResumer' in an isolated closure". Adding the conformance makes the intent explicit and future-proofs the code.