Merge pull request #72714 from rintaro/macros-bridgedloc-rdar125625879

rintaro · web-flow · commit 78dc9613d631 · 2024-04-02T10:22:01.000-07:00
[ASTGen/Macros] Ensure 'offset' from plugin response is valid
diff --git a/lib/ASTGen/Sources/ASTGen/PluginHost.swift b/lib/ASTGen/Sources/ASTGen/PluginHost.swift
@@ -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 {
+      return nil
+    }
     return BridgedSourceLoc(raw: bufferBaseAddress).advanced(by: offset)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,10 @@ class PluginDiagnosticsEngine {`
`349`	`349`	`guard let bufferBaseAddress = exportedSourceFile.pointee.buffer.baseAddress else {`
`350`	`350`	`return nil`
`351`	`351`	`}`
	`352`	`+ // Ensure 'offset' is within the buffer.`
	`353`	`+ guard offset <= exportedSourceFile.pointee.buffer.count else {`
	`354`	`+ return nil`
	`355`	`+ }`
`352`	`356`	`return BridgedSourceLoc(raw: bufferBaseAddress).advanced(by: offset)`
`353`	`357`	`}`
`354`	`358`