rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2462 from Skgland/fix-segfault

Browse Source 
fix segfault by dropping loader state payload after resetting machine
This commit is contained in:
Mark Thom
2024-08-03 14:05:13 -06:00
committed by GitHub
parent 5038b716eb 9e8d8aa19e
commit 4ce4cd1bc1
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arena.rs
View File

@@ -305,9 +305,11 @@ impl<T: ?Sized + ArenaAllocated> TypedArenaPtr<T> {
impl<P, T: ?Sized + ArenaAllocated<Payload = ManuallyDrop<P>>> TypedArenaPtr<T> { impl<P, T: ?Sized + ArenaAllocated<Payload = ManuallyDrop<P>>> TypedArenaPtr<T> {
pub fn drop_payload(&mut self) { pub fn drop_payload(&mut self) {
if self.get_tag() != ArenaHeaderTag::Dropped {
self.set_tag(ArenaHeaderTag::Dropped); self.set_tag(ArenaHeaderTag::Dropped);
unsafe { ManuallyDrop::drop(&mut *self.as_ptr()) } unsafe { ManuallyDrop::drop(&mut *self.as_ptr()) }
} }
}
} }
impl<T: ?Sized + ArenaAllocated> TypedArenaPtr<T> impl<T: ?Sized + ArenaAllocated> TypedArenaPtr<T>

2
src/machine/loader.rs
View File

@@ -323,8 +323,8 @@ impl<'a> LoadState<'a> for LiveLoadAndMachineState<'a> {
#[inline(always)] #[inline(always)]
fn reset_machine(loader: &mut Loader<'a, Self>) { fn reset_machine(loader: &mut Loader<'a, Self>) {
if loader.payload.load_state.get_tag() != ArenaHeaderTag::Dropped { if loader.payload.load_state.get_tag() != ArenaHeaderTag::Dropped {
loader.payload.load_state.drop_payload();
loader.reset_machine(); loader.reset_machine();
loader.payload.load_state.drop_payload();
} }
} }