mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nasty double-free bug where a newrt chan could get killed after rescheduling but before suppressing_finalize.

Browse Source
This commit is contained in:
Ben Blum 2013-08-01 21:57:58 -04:00
parent be7738bfa1
commit cde6ad3992
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/rt/comm.rs
View File

@ -131,6 +131,13 @@ impl<T> ChanOne<T> {
// acquire barrier that keeps the subsequent access of the
// ~Task pointer from being reordered.
let oldstate = (*packet).state.swap(STATE_ONE, SeqCst);
// Suppress the synchronizing actions in the finalizer. We're
// done with the packet. NB: In case of do_resched, this *must*
// happen before waking up a blocked task (or be unkillable),
// because we might get a kill signal during the reschedule.
this.suppress_finalize = true;
match oldstate {
STATE_BOTH => {
// Port is not waiting yet. Nothing to do
@ -165,8 +172,6 @@ impl<T> ChanOne<T> {
}
}
// Suppress the synchronizing actions in the finalizer. We're done with the packet.
this.suppress_finalize = true;
return recvr_active;
}
}