Skip to content

Commit b010ac8

Browse files
committed
fix use-after-free
1 parent aa9aa77 commit b010ac8

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Sources/JavaScriptKit/BridgeJSIntrinsics.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,12 @@ extension JSObject: _BridgedSwiftStackType {
384384
}
385385

386386
@_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 {
387-
return _swift_js_retain(Int32(bitPattern: self.id))
387+
// withExtendedLifetime is required here to prevent a use-after-free.
388+
// In a `consuming func`, Swift ARC may release `self` (and thus release
389+
// the underlying JS reference) as soon as it extracts `self.id`, which
390+
// happens *before* `_swift_js_retain` is called. `withExtendedLifetime` forces
391+
// `self` to stay alive until after `_swift_js_retain` returns.
392+
return withExtendedLifetime(self) { _swift_js_retain(Int32(bitPattern: self.id)) }
388393
}
389394

390395
@_spi(BridgeJS) public consuming func bridgeJSStackPush() {

0 commit comments

Comments
 (0)