[Minor] Some more fixes

diff --git a/src/libutil/cxx/locked_file.cxx b/src/libutil/cxx/locked_file.cxx
index b6d0d6215c33899c760cde6a01c9419ba658435e..ca5600c5fbf1f85706936014b0ef982ee30a0e07 100644 (file)
--- a/src/libutil/cxx/locked_file.cxx
+++ b/src/libutil/cxx/locked_file.cxx
@@ -148,7 +148,9 @@ auto raii_mmaped_locked_file::mmap_shared(const char *fname, int open_flags,
 
 raii_mmaped_locked_file::~raii_mmaped_locked_file()
 {
-       munmap(map, file.get_stat().st_size);
+       if (map != nullptr) {
+               munmap(map, file.get_stat().st_size);
+       }
 }
 
 raii_mmaped_locked_file::raii_mmaped_locked_file(raii_mmaped_locked_file &&other) noexcept

diff --git a/src/libutil/cxx/locked_file.hxx b/src/libutil/cxx/locked_file.hxx
index d136ebe72de25c910d6bcaa49c3b0a34a702f7e0..6ac4ffd2ca6f965ca210ac7fe7a592b78161a598 100644 (file)
--- a/src/libutil/cxx/locked_file.hxx
+++ b/src/libutil/cxx/locked_file.hxx
@@ -59,7 +59,7 @@ struct raii_locked_file final {
        raii_locked_file() = delete;
        raii_locked_file(const raii_locked_file &other) = delete;
 private:
-       int fd;
+       int fd = -1;
        bool temp;
        std::string fname;
        struct stat st;
@@ -94,7 +94,7 @@ private:
        /* Is intended to be used with map_shared */
        explicit raii_mmaped_locked_file(raii_locked_file &&_file, void *_map);
        raii_locked_file file;
-       void *map{};
+       void *map = nullptr;
 };
 
 /**