From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 29 Dec 2012 01:52:24 +0000 (-0500)
Subject: Fix a crash bug when running an node without IPv6-exit support.
X-Git-Tag: tor-0.2.4.8-alpha~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e22cfe2b40eab8c754a9c7622a1f5a85d202641;p=thirdparty%2Ftor.git

Fix a crash bug when running an node without IPv6-exit support.

Fixes bug 7814; bugfix on 0.2.4.7-alpha.
---

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;
     }
   }