Merge pull request #59297 from apple/egorzhdan/cxx-overlay-dangling-ptr

egorzhdan · web-flow · commit 59bb4cb11a72 · 2022-06-07T19:06:48.000+01:00
[cxx-interop] Fix a potential dangling pointer in `String(cxxString:)`
diff --git a/stdlib/public/Cxx/String.swift b/stdlib/public/Cxx/String.swift
@@ -22,5 +22,6 @@ extension std.string {
 extension String {
   public init(cxxString: std.string) {
     self.init(cString: cxxString.c_str())
+    withExtendedLifetime(cxxString) {}
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@ extension std.string {`
`22`	`22`	`extension String {`
`23`	`23`	`public init(cxxString: std.string) {`
`24`	`24`	`self.init(cString: cxxString.c_str())`
	`25`	`+ withExtendedLifetime(cxxString) {}`
`25`	`26`	`}`
`26`	`27`	`}`