mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge branch 'maint-0.4.0'
This commit is contained in:
commit
c3fca4e4b3
3
changes/bug29508
Normal file
3
changes/bug29508
Normal file
@ -0,0 +1,3 @@
|
||||
o Minor bugfixes (scheduler):
|
||||
- When readding channels to the pending list, check the correct channel's
|
||||
sched_heap_idx. Fixes bug 29508; bugfix on 0.3.2.10
|
@ -724,7 +724,7 @@ kist_scheduler_run(void)
|
||||
SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) {
|
||||
scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING);
|
||||
if (!smartlist_contains(cp, readd_chan)) {
|
||||
if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) {
|
||||
if (!SCHED_BUG(readd_chan->sched_heap_idx != -1, readd_chan)) {
|
||||
/* XXXX Note that the check above is in theory redundant with
|
||||
* the smartlist_contains check. But let's make sure we're
|
||||
* not messing anything up, and leave them both for now. */
|
||||
|
Loading…
Reference in New Issue
Block a user