From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 17 Sep 2021 14:06:01 +0000 (+0200)
Subject: Merge pull request #9662 from cmouse/patch-1604087167
X-Git-Tag: dnsdist-1.7.0-alpha1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6cfaec150374684c341cb6475fea34dd8882076;p=thirdparty%2Fpdns.git

Merge pull request #9662 from cmouse/patch-1604087167

Coverity fixes
---

b6cfaec150374684c341cb6475fea34dd8882076
diff --cc pdns/dbdnsseckeeper.cc
index 20e9d43d36,a318a36ada..c8149f58f3
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@@ -117,14 -119,20 +117,15 @@@ bool DNSSECKeeper::addKey(const DNSName
  }
  
  void DNSSECKeeper::clearAllCaches() {
 -  {
 -    WriteLock l(&s_keycachelock);
 -    s_keycache.clear();
 -  }
 -  WriteLock l(&s_metacachelock);
 -  s_metacache.clear();
 +  s_keycache.write_lock()->clear();
 +  s_metacache.write_lock()->clear();
  }
  
- 
+ /* This function never fails, the return value is to simplify call chains
+    elsewhere so we can do mutate<cache> && clear<cache> */
  bool DNSSECKeeper::clearKeyCache(const DNSName& name)
  {
 -  WriteLock l(&s_keycachelock);
 -  s_keycache.erase(name);
 +  s_keycache.write_lock()->erase(name);
    return true;
  }