diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-31 12:51:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-31 12:51:45 -0500 |
| commit | 2294e330bde259f6b575f301258783ce2947bdc0 (patch) | |
| tree | f526812bc11d2897f759d0630ddfe55124685682 | |
| parent | 1e81aaa62f8c7c4ac7dfd3c8b4182cc2d5368ab5 (diff) | |
| parent | df312b3cf637d2c5487adc60ed541823bef56f06 (diff) | |
| download | tor-2294e330bde259f6b575f301258783ce2947bdc0.tar.gz tor-2294e330bde259f6b575f301258783ce2947bdc0.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | changes/bug24976 | 5 | ||||
| -rw-r--r-- | src/or/hs_cache.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug24976 b/changes/bug24976 new file mode 100644 index 0000000000..9c3be86eab --- /dev/null +++ b/changes/bug24976 @@ -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. diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index 1a8fdbd03b..ed38a603b4 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -636,8 +636,8 @@ cache_store_as_client(hs_cache_client_descriptor_t *client_desc) if (cache_entry != NULL) { /* 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. */ - if (BUG(cache_entry->desc->plaintext_data.revision_counter > - client_desc->desc->plaintext_data.revision_counter)) { + if (cache_entry->desc->plaintext_data.revision_counter > + client_desc->desc->plaintext_data.revision_counter) { cache_client_desc_free(client_desc); goto done; } |