Merge pull request #14896 from omoerbeek/rec-coverity-20241127

rec: coverity fixes, all minor optimizations
PowerDNS · Nov 29, 2024 · 8e773ea · 8e773ea
2 parents 4056b0e + 009d3ea
commit 8e773ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pdns/recursordist/aggressive_nsec.cc b/pdns/recursordist/aggressive_nsec.cc
@@ -350,7 +350,7 @@ void AggressiveNSECCache::insertNSEC(const DNSName& zone, const DNSName& owner,
         ++d_entriesCount;
       }
       else {
-        zoneEntry->d_entries.replace(pair.first, {record.getContent(), signatures, std::move(realOwner), next, qname, record.d_ttl, qtype});
+        zoneEntry->d_entries.replace(pair.first, {record.getContent(), signatures, std::move(realOwner), std::move(next), qname, record.d_ttl, qtype});
       }
     }
     else {

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
@@ -3588,7 +3588,7 @@ static void activateForwardingCatalogZones(LuaConfigItems& lci)
     auto zone = std::make_shared<CatalogZone>();
     // zoneSizeHint ignored
     zone->setName(DNSName(params.name));
-    fcz.d_catz = zone;
+    fcz.d_catz = std::move(zone);
   }
 }
 

diff --git a/pdns/recursordist/rpzloader.cc b/pdns/recursordist/rpzloader.cc
@@ -652,7 +652,7 @@ static bool RPZTrackerIteration(RPZTrackerParams& params, const DNSName& zoneNam
 
     /* only update sr now that all changes have been converted */
     if (currentSR) {
-      newZone->setSOA(dnsRecord);
+      newZone->setSOA(std::move(dnsRecord));
       params.zoneXFRParams.soaRecordContent = std::move(currentSR);
     }
     SLOG(g_log << Logger::Info << "Had " << totremove << " RPZ removal" << addS(totremove) << ", " << totadd << " addition" << addS(totadd) << " for " << zoneName << " New serial: " << params.soaRecordContent->d_st.serial << endl,
-Original file line number
+Diff line change
@@ Expand Up @@
             ++d_entriesCount;
           }
           else {
-            zoneEntry->d_entries.replace(pair.first, {record.getContent(), signatures, std::move(realOwner), next, qname, record.d_ttl, qtype});
+            zoneEntry->d_entries.replace(pair.first, {record.getContent(), signatures, std::move(realOwner), std::move(next), qname, record.d_ttl, qtype});
           }
         }
         else {
@@ Expand Down @@