summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-28 20:52:24 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-29 01:22:34 -0500
commit5e22cfe2b40eab8c754a9c7622a1f5a85d202641 (patch)
treed0cc6fd6b1923c12cee244a091f4feecd9798d24
parent127cb39ffcacbcd99633671e92d299ef53bbac46 (diff)
downloadtor-5e22cfe2b40eab8c754a9c7622a1f5a85d202641.tar.gz
tor-5e22cfe2b40eab8c754a9c7622a1f5a85d202641.zip
Fix a crash bug when running an node without IPv6-exit support.
Fixes bug 7814; bugfix on 0.2.4.7-alpha.
-rw-r--r--changes/bug78144
-rw-r--r--src/or/connection_edge.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug7814 b/changes/bug7814
new file mode 100644
index 0000000000..7ecc2427af
--- /dev/null
+++ b/changes/bug7814
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+ - Avoid crashing when, as a node without IPv6-exit support, a
+ client insists on getting an IPv6 address or nothing. Fixes bug
+ #7814; bugfix on 0.2.4.7-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index defe94408b..a0ebfd1397 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2427,6 +2427,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
tor_free(address);
relay_send_end_cell_from_edge(rh.stream_id, circ,
END_STREAM_REASON_EXITPOLICY, NULL);
+ return 0;
}
}