aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendclient.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-15 14:17:59 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-15 14:17:59 -0500
commit07888ed8e431b10d21d18e86092e20ddef0a2bca (patch)
tree02a81faf9ef9ff526a490f7c7c5c41d51ee59428 /src/or/rendclient.c
parent1758ef51de8b44141184a36bcd36dea349d9e65d (diff)
parenta7790d48af73760a2ae10fcff70b319914316b90 (diff)
downloadtor-07888ed8e431b10d21d18e86092e20ddef0a2bca.tar.gz
tor-07888ed8e431b10d21d18e86092e20ddef0a2bca.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/rendclient.c')
-rw-r--r--src/or/rendclient.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 1907d5a6cd..255c16bf08 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -674,8 +674,10 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request,
* attach only the connections that are waiting on this circuit, rather
* than trying to attach them all. See comments bug 743. */
connection_ap_attach_pending();
+ memset(keys, 0, sizeof(keys));
return 0;
err:
+ memset(keys, 0, sizeof(keys));
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
return -1;
}