make servers not crash when they rep-hist-note circuits that don't start at them

svn:r1317

1 files changed, 8 insertions, 0 deletions

diff --git a/src/or/circuit.c b/src/or/circuit.c
index 9c07532ff2..45b10ee252 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -833,6 +833,14 @@ circuit_rep_hist_note_result(circuit_t *circ)
   char *prev_nickname = NULL;
   routerinfo_t *router;
   hop = circ->cpath;
+  if(!hop) {
+    /* XXX
+     * if !hop, then we're not the beginning of this circuit.
+     * for now, just forget about it. later, we should remember when
+     * extends-through-us failed, too.
+     */
+    return;
+  }
   if (options.ORPort) {
     prev_nickname = options.Nickname;
   }