[ASTGen/Macros] Ensure 'offset' from plugin response is valid #72714
Conversation
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
We see some crashes presumably caused by invalid 'offset' returned from macro plugins. Although we haven't been able to find a reproducer, guard not to generate invalid source location by checking 'offfset' is within the buffer length. rdar://125625879
rintaro
requested review from
ahoppen,
bnbarham,
CodaFi and
hamishknight
as code owners
|
@swift-ci Please smoke test |
rintaro
commented
Mar 29, 2024
| @@ -349,6 +349,10 @@ class PluginDiagnosticsEngine { | |||
| guard let bufferBaseAddress = exportedSourceFile.pointee.buffer.baseAddress else { | |||
| return nil | |||
| } | |||
| // Ensure 'offset' is within the buffer. | |||
| guard offset <= exportedSourceFile.pointee.buffer.count else { | |||
There was a problem hiding this comment.
<= because the end of the buffer is part of the buffer.
https://github.com/apple/swift/blob/9f067c19405f3380e5206fe95ea8e878abd04c11/lib/Basic/SourceLoc.cpp#L498-L500
bnbarham
approved these changes
Mar 30, 2024
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.
We see some crashes presumably caused by invalid 'offset' returned from macro plugins. Although we haven't been able to find a reproducer, guard not to generate invalid source location by checking 'offfset' is within the buffer length.
rdar://125625879