[tor-commits] [tor/master] hs: Only note a connection attempt with a valid rend_data

[nickm at torproject.org]

commit e67f8623f95082341c06c9c70ef664ed7b186483
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 25 10:31:44 2017 -0400

    hs: Only note a connection attempt with a valid rend_data
    
    For now, prop224 doesn't have a mechanism to note down connection attempts so
    we only do it for legacy system using rend_data.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/connection_edge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 8ef3379c4..3dd08b6d2 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -155,7 +155,9 @@ connection_mark_unattached_ap_,(entry_connection_t *conn, int endreason,
    * but we should fix it someday anyway. */
   if ((edge_conn->on_circuit != NULL || edge_conn->edge_has_sent_end) &&
       connection_edge_is_rendezvous_stream(edge_conn)) {
-    rend_client_note_connection_attempt_ended(edge_conn->rend_data);
+    if (edge_conn->rend_data) {
+      rend_client_note_connection_attempt_ended(edge_conn->rend_data);
+    }
   }
 
   if (base_conn->marked_for_close) {