Commit c3fca4e4 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.4.0'

parents f7092934 4df31ade

changes/bug29508

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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

src/core/or/scheduler_kist.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */