Commit e618a7e4 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.5' into maint-0.4.6

parents 5260b4ef 691e542f

changes/bug40645

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (defense in depth):

    - Change a test in the netflow padding code to make it more

      _obviously_ safe against remotely triggered crashes.

      (It was safe against these before, but not obviously so.)

      Fixes bug 40645; bugfix on 0.3.1.1-alpha.

src/core/or/channelpadding.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan) 
    high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms);

  }



  if (low_timeout == high_timeout)

  if (low_timeout >= high_timeout)

    return low_timeout; // No randomization



  /*

src/core/or/command.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan) 
       * DESTROY cell down the circuit so relays can stop queuing in-flight

       * cells for this circuit which helps with memory pressure. */

      log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit.");

      circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);

      circuit_mark_for_close(circ, reason | END_CIRC_REASON_FLAG_REMOTE);

    }

  }

}