leyoda/softbuffer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
macOS: Fix double-free of `NSWindow`
This commit is contained in:
Mads Marquart 2023-11-15 02:30:33 +01:00 • committed by GitHub
commit ac92d531ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
# Unreleased
- MacOS: Fix double-free of `NSWindow`.
# 0.4.0 # 0.4.0
- **Breaking:** Port to use `raw-window-handle` v0.6.(#132) - **Breaking:** Port to use `raw-window-handle` v0.6.(#132)

3
src/cg.rs
View file

@ -42,7 +42,8 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> CGImpl<D, W> {
_ => return Err(InitError::Unsupported(window_src)), _ => return Err(InitError::Unsupported(window_src)),
}; };
let view = handle.ns_view.as_ptr() as id; 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(); let layer = CALayer::new();
unsafe { unsafe {
let subview: id = NSView::alloc(nil).initWithFrame_(NSView::frame(view)); let subview: id = NSView::alloc(nil).initWithFrame_(NSView::frame(view));