diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-03 10:14:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-03 10:35:07 -0500 |
| commit | 19e25d5cabd23f28044ccbddc01e5cacbde2cfcb (patch) | |
| tree | 5c7d209abd9dc33ab61990e05c783940e623dcd1 /src/or/circuitbuild.c | |
| parent | 9d5a9feb404c61d93309eea1c68fcae3ff0cf8f3 (diff) | |
| download | tor-19e25d5cabd23f28044ccbddc01e5cacbde2cfcb.tar.gz tor-19e25d5cabd23f28044ccbddc01e5cacbde2cfcb.zip | |
Prevention: never die from extend_info_from_node() failure.
Bug 21242 occurred because we asserted that extend_info_from_node()
had succeeded...even though we already had the code to handle such a
failure. We fixed that in 93b39c51629ed0ded2bf807cb6.
But there were four other cases in our code where we called
extend_info_from_node() and either tor_assert()ed that it returned
non-NULL, or [in one case] silently assumed that it returned
non-NULL. That's not such a great idea. This patch makes those
cases check for a bug of this kind instead.
Fixes bug 21372; bugfix on 0.2.3.1-alpha when
extend_info_from_node() was introduced.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 88445f9248..8a57d8387a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2110,7 +2110,8 @@ onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei) return -1; } exit_ei = extend_info_from_node(node, 0); - tor_assert(exit_ei); + if (BUG(exit_ei == NULL)) + return -1; } state->chosen_exit = exit_ei; return 0; @@ -2376,7 +2377,7 @@ onion_extend_cpath(origin_circuit_t *circ) choose_good_middle_server(purpose, state, circ->cpath, cur_len); if (r) { info = extend_info_from_node(r, 0); - tor_assert(info); + tor_assert_nonfatal(info); } } |