nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-12 13:43:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-31 12:51:45 -05:00
commit c35416ab8f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug24976 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (hidden service v3 client):
- Remove a BUG() statement which can be triggered in normal circumstances
where a client fetches a descriptor that has a lower revision counter
than the one in its cache. This can happen due to HSDir desync. Fixes
bug 24976; bugfix on 0.3.2.1-alpha.

4
src/or/hs_cache.c
View File

@ -624,8 +624,8 @@ cache_store_as_client(hs_cache_client_descriptor_t *client_desc)
if (cache_entry != NULL) { if (cache_entry != NULL) {
/* If we have an entry in our cache that has a revision counter greater /* If we have an entry in our cache that has a revision counter greater
* than the one we just fetched, discard the one we fetched. */ * than the one we just fetched, discard the one we fetched. */
if (BUG(cache_entry->desc->plaintext_data.revision_counter > if (cache_entry->desc->plaintext_data.revision_counter >
client_desc->desc->plaintext_data.revision_counter)) { client_desc->desc->plaintext_data.revision_counter) {
cache_client_desc_free(client_desc); cache_client_desc_free(client_desc);
goto done; goto done;
} }