Commit 338d00ba authored Oct 13, 2021 by Mike Perry

Fix NULL pointer deref in logs

parent 86f81abe

src/core/or/congestion_control_common.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1040,9 +1040,8 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
		"%"PRIu64", "
		"%"PRIu64", "
		"%"PRIu64". ",
		// XXX: actually, is this p_chan here? This is
		// an or_circuit (exit or onion)
		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->min_rtt_usec/1000,
		curr_rtt_usec/1000,
		cc->ewma_rtt_usec/1000,

src/core/or/congestion_control_nola.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,8 @@ congestion_control_nola_process_sendme(congestion_control_t *cc,
		"INFL: %"PRIu64", "
		"NCCE: %"PRIu64", "
		"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->inflight,
		cc->next_cc_event,

src/core/or/congestion_control_vegas.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,8 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
		"QUSE: %"PRIu64", "
		"NCCE: %"PRIu64", "
		"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->inflight,
		vegas_bdp_mix(cc),

src/core/or/congestion_control_westwood.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,8 @@ congestion_control_westwood_process_sendme(congestion_control_t *cc,
		"WRTT: %"PRIu64", "
		"WSIG: %"PRIu64", "
		"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->inflight,
		cc->next_cc_event,