torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2015-10-21 10:28:16 -04:00
parent 6ef35319d9 03eb999d42
commit a5e873ff29
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/rendcache.c
+5 -2
View File
@@ -369,7 +369,7 @@ cache_failure_intro_add(const uint8_t *identity, const char *service_id,
rend_intro_point_failure_t failure)
{
rend_cache_failure_t *fail_entry;
rend_cache_failure_intro_t *entry;
rend_cache_failure_intro_t *entry, *old_entry;
/* Make sure we have a failure object for this service ID and if not,
* create it with this new intro failure entry. */
@@ -380,7 +380,10 @@ cache_failure_intro_add(const uint8_t *identity, const char *service_id,
strmap_set_lc(rend_cache_failure, service_id, fail_entry);
}
entry = rend_cache_failure_intro_entry_new(failure);
digestmap_set(fail_entry->intro_failures, (char *) identity, entry);
old_entry = digestmap_set(fail_entry->intro_failures,
(char *) identity, entry);
/* This _should_ be NULL, but in case it isn't, free it. */
rend_cache_failure_intro_entry_free(old_entry);
}
/** Using a parsed descriptor <b>desc</b>, check if the introduction points