mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 12:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix unsafe memory access when converting entity handles

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-05 11:12:18 +02:00
parent 4b533c339d
commit 7a6010e7dc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/gpui/src/app.rs
View file

@ -4451,7 +4451,7 @@ impl AnyViewHandle {
handle_id: self.handle_id, handle_id: self.handle_id,
}); });
unsafe { unsafe {
Arc::decrement_strong_count(&self.ref_counts); Arc::decrement_strong_count(Arc::as_ptr(&self.ref_counts));
} }
std::mem::forget(self); std::mem::forget(self);
result result
@ -4517,8 +4517,9 @@ impl<T: View> From<ViewHandle<T>> for AnyViewHandle {
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
handle_id: handle.handle_id, handle_id: handle.handle_id,
}; };
unsafe { unsafe {
Arc::decrement_strong_count(&handle.ref_counts); Arc::decrement_strong_count(Arc::as_ptr(&handle.ref_counts));
} }
std::mem::forget(handle); std::mem::forget(handle);
any_handle any_handle
@ -4580,7 +4581,7 @@ impl AnyModelHandle {
handle_id: self.handle_id, handle_id: self.handle_id,
}); });
unsafe { unsafe {
Arc::decrement_strong_count(&self.ref_counts); Arc::decrement_strong_count(Arc::as_ptr(&self.ref_counts));
} }
std::mem::forget(self); std::mem::forget(self);
result result