mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.0'

Browse source
This commit is contained in:
Nick Mathewson 2019-02-19 11:51:24 -05:00
commit c3fca4e4b3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug29508 Normal file
View 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

2
src/core/or/scheduler_kist.c
View file

@ -724,7 +724,7 @@ kist_scheduler_run(void)
SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) {
scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING); scheduler_set_channel_state(readd_chan, SCHED_CHAN_PENDING);
if (!smartlist_contains(cp, readd_chan)) { 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 /* XXXX Note that the check above is in theory redundant with
* the smartlist_contains check. But let's make sure we're * the smartlist_contains check. But let's make sure we're
* not messing anything up, and leave them both for now. */ * not messing anything up, and leave them both for now. */