tor

commit 2294e330bde259f6b575f301258783ce2947bdc0
parent 1e81aaa62f8c7c4ac7dfd3c8b4182cc2d5368ab5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 31 Jan 2018 12:51:45 -0500

Merge branch 'maint-0.3.2'

Diffstat:
A
changes/bug24976
 | 
5
+++++
M
src/or/hs_cache.c
 | 
4
++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug24976 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
@@ -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;
     }