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

This commit is contained in:
Nick Mathewson 2015-10-21 10:00:52 -04:00
commit 46cd466dec
2 changed files with 4 additions and 1 deletions

3
changes/bug17401 Normal file
View File

@ -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.

View File

@ -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);