Merge pull request #180 from rust-windowing/fix-double-free

macOS: Fix double-free of `NSWindow`
rust-windowing · Nov 15, 2023 · ac92d53 · ac92d53
2 parents 800f640 + f198b22
commit ac92d53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+- MacOS: Fix double-free of `NSWindow`.
+
 # 0.4.0
 
 - **Breaking:** Port to use `raw-window-handle` v0.6.(#132)

diff --git a/src/cg.rs b/src/cg.rs
@@ -42,7 +42,8 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> CGImpl<D, W> {
             _ => return Err(InitError::Unsupported(window_src)),
         };
         let view = handle.ns_view.as_ptr() as id;
-        let window = unsafe { msg_send![view, window] };
+        let window: id = unsafe { msg_send![view, window] };
+        let window: id = unsafe { msg_send![window, retain] };
         let layer = CALayer::new();
         unsafe {
             let subview: id = NSView::alloc(nil).initWithFrame_(NSView::frame(view));