From a8d66def7df305872fce2b6a3912302cfe23b8f6 Mon Sep 17 00:00:00 2001 From: Robin Geuze Date: Fri, 25 Sep 2020 15:32:07 +0200 Subject: [PATCH] Fix a small coverity issue in lmdb backend and fix a compiler warning --- modules/lmdbbackend/lmdbbackend.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc index 0f26c38e65..adccc89d35 100644 --- a/modules/lmdbbackend/lmdbbackend.cc +++ b/modules/lmdbbackend/lmdbbackend.cc @@ -238,7 +238,7 @@ std::string serToString(const vector& rrs) return ret; } -size_t serOneRRFromString(const string_view& str, DNSResourceRecord& rr) +static inline size_t serOneRRFromString(const string_view& str, DNSResourceRecord& rr) { uint16_t len; memcpy(&len, &str[0], 2); @@ -546,8 +546,8 @@ bool LMDBBackend::upgradeToSchemav3() { for(auto i = 0; i < d_shards; i++) { string filename = getArg("filename")+"-"+std::to_string(i); - if (!access(filename.c_str(), F_OK)) { - rename(filename.c_str(), (filename+"-old").c_str()); + if (rename(filename.c_str(), (filename+"-old").c_str()) < 0) { + unixDie("Rename failed during LMDB upgrade"); } LMDBBackend::RecordsDB oldShard, newShard; -- 2.47.2