nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a deref-before-null-check complaint

Browse Source 
Found by coverity scan; this is CID 1372329.

Also, reindent some oddly indented code.
This commit is contained in:
Nick Mathewson 2016-08-31 10:32:10 -04:00
parent e3bf8854c8
commit c15b99e6e9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/circuitbuild.c
View File

@ -855,7 +855,12 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out,
/* XXXX030 Remove support for deciding to use TAP. */ /* XXXX030 Remove support for deciding to use TAP. */
/* It is an error to extend if there is no previous node. */ /* It is an error to extend if there is no previous node. */
tor_assert_nonfatal(node_prev); if (BUG(node_prev == NULL)) {
*cell_type_out = RELAY_COMMAND_EXTEND;
*create_cell_type_out = CELL_CREATE;
return;
}
/* It is an error for a node with a known version to be so old it does not /* It is an error for a node with a known version to be so old it does not
* support ntor. */ * support ntor. */
tor_assert_nonfatal(routerstatus_version_supports_ntor(node_prev->rs, 1)); tor_assert_nonfatal(routerstatus_version_supports_ntor(node_prev->rs, 1));
@ -863,16 +868,15 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out,
/* Assume relays without tor versions or routerstatuses support ntor. /* Assume relays without tor versions or routerstatuses support ntor.
* The authorities enforce ntor support, and assuming and failing is better * The authorities enforce ntor support, and assuming and failing is better
* than allowing a malicious node to perform a protocol downgrade to TAP. */ * than allowing a malicious node to perform a protocol downgrade to TAP. */
if (node_prev && if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP &&
(node_has_curve25519_onion_key(node_prev) || (node_has_curve25519_onion_key(node_prev) ||
(routerstatus_version_supports_ntor(node_prev->rs, 1)))) { (routerstatus_version_supports_ntor(node_prev->rs, 1)))) {
*cell_type_out = RELAY_COMMAND_EXTEND2; *cell_type_out = RELAY_COMMAND_EXTEND2;
*create_cell_type_out = CELL_CREATE2; *create_cell_type_out = CELL_CREATE2;
} else { } else {
*cell_type_out = RELAY_COMMAND_EXTEND; *cell_type_out = RELAY_COMMAND_EXTEND;
*create_cell_type_out = CELL_CREATE; *create_cell_type_out = CELL_CREATE;
} }
} }
/** This is the backbone function for building circuits. /** This is the backbone function for building circuits.