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

Fix NULL pointer deref in logs

Browse source
This commit is contained in:
Mike Perry 2021-10-13 21:06:33 +00:00
parent 86f81abe30
commit 338d00ba92
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/or/congestion_control_common.c
View file

@ -1040,9 +1040,8 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
"%"PRIu64", " "%"PRIu64", "
"%"PRIu64", " "%"PRIu64", "
"%"PRIu64". ", "%"PRIu64". ",
// XXX: actually, is this p_chan here? This is CONST_TO_OR_CIRCUIT(circ)->p_chan->global_identifier,
// an or_circuit (exit or onion) CONST_TO_OR_CIRCUIT(circ)->p_circ_id,
circ->n_chan->global_identifier, circ->n_circ_id,
cc->min_rtt_usec/1000, cc->min_rtt_usec/1000,
curr_rtt_usec/1000, curr_rtt_usec/1000,
cc->ewma_rtt_usec/1000, cc->ewma_rtt_usec/1000,

3
src/core/or/congestion_control_nola.c
View file

@ -111,7 +111,8 @@ congestion_control_nola_process_sendme(congestion_control_t *cc,
"INFL: %"PRIu64", " "INFL: %"PRIu64", "
"NCCE: %"PRIu64", " "NCCE: %"PRIu64", "
"SS: %d", "SS: %d",
circ->n_chan->global_identifier, circ->n_circ_id, CONST_TO_OR_CIRCUIT(circ)->p_chan->global_identifier,
CONST_TO_OR_CIRCUIT(circ)->p_circ_id,
cc->cwnd, cc->cwnd,
cc->inflight, cc->inflight,
cc->next_cc_event, cc->next_cc_event,

3
src/core/or/congestion_control_vegas.c
View file

@ -255,7 +255,8 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
"QUSE: %"PRIu64", " "QUSE: %"PRIu64", "
"NCCE: %"PRIu64", " "NCCE: %"PRIu64", "
"SS: %d", "SS: %d",
circ->n_chan->global_identifier, circ->n_circ_id, CONST_TO_OR_CIRCUIT(circ)->p_chan->global_identifier,
CONST_TO_OR_CIRCUIT(circ)->p_circ_id,
cc->cwnd, cc->cwnd,
cc->inflight, cc->inflight,
vegas_bdp_mix(cc), vegas_bdp_mix(cc),

3
src/core/or/congestion_control_westwood.c
View file

@ -213,7 +213,8 @@ congestion_control_westwood_process_sendme(congestion_control_t *cc,
"WRTT: %"PRIu64", " "WRTT: %"PRIu64", "
"WSIG: %"PRIu64", " "WSIG: %"PRIu64", "
"SS: %d", "SS: %d",
circ->n_chan->global_identifier, circ->n_circ_id, CONST_TO_OR_CIRCUIT(circ)->p_chan->global_identifier,
CONST_TO_OR_CIRCUIT(circ)->p_circ_id,
cc->cwnd, cc->cwnd,
cc->inflight, cc->inflight,
cc->next_cc_event, cc->next_cc_event,