Browse Source

Merge remote-tracking branch 'origin/maint-0.2.7'

Nick Mathewson 8 years ago
parent
commit
46cd466dec
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug17401
  2. 1 1
      src/or/rendcache.c

+ 3 - 0
changes/bug17401

@@ -0,0 +1,3 @@
+  o Major bugfixes (correctness):
+    - Fix a use-after-free bug in validate_intro_point_failure().
+      Fixes bug 17401; bugfix on 0.2.7.3-rc.

+ 1 - 1
src/or/rendcache.c

@@ -418,8 +418,8 @@ validate_intro_point_failure(const rend_service_descriptor_t *desc,
       SMARTLIST_DEL_CURRENT(desc->intro_nodes, intro);
       /* Keep it for our new entry. */
       digestmap_set(new_entry->intro_failures, (char *) identity, ent_dup);
+      /* Only free it when we're done looking at it. */
       rend_intro_point_free(intro);
-
       continue;
     }
   } SMARTLIST_FOREACH_END(intro);