diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-23 15:55:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-23 15:55:08 -0400 |
| commit | 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1 (patch) | |
| tree | 12f20b1ea3070664666c19cbe77d9417a30f2e19 | |
| parent | eac4c374e456af4f216392ec2d3b037d5f57e2f3 (diff) | |
| parent | b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 (diff) | |
| download | tor-9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1.tar.gz tor-9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -rw-r--r-- | changes/bug23874 | 3 | ||||
| -rw-r--r-- | src/or/nodelist.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 0000000000..bf6620553d --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 2ca52e74b5..938b791102 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1127,6 +1127,11 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + /* Check ri first, because rewrite_node_address_for_bridge() updates * node->ri with the configured bridge address. */ |