From 009d3ea504cd1f4e260b7b900f467e21290bea40 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Wed, 27 Nov 2024 09:07:39 +0100 Subject: [PATCH] rec: coverity fixes, all minor optimizations --- pdns/recursordist/aggressive_nsec.cc | 2 +- pdns/recursordist/rec-main.cc | 2 +- pdns/recursordist/rpzloader.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pdns/recursordist/aggressive_nsec.cc b/pdns/recursordist/aggressive_nsec.cc index 388c720016..e894666d50 100644 --- 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 index 8c750d25a8..4b9229a765 100644 --- 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(); // 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 index 6af30447dc..1ba0c9b656 100644 --- 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, -- 2.47.2