Coverity fixes

metsma · metsma · commit 7ce54d6e751f · 2026-07-03T11:32:36.000+03:00
IB-8899

Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/src/ASiC_S.cpp b/src/ASiC_S.cpp
@@ -85,7 +85,7 @@ ASiC_S::ASiC_S(const string &path, bool create)
         THROW("ASiC-S container does not contain any signatures.");
 }
 
-void ASiC_S::addDataFileChecks(const string &fileName, const string &mediaType)
+void ASiC_S::addDataFileChecks(string_view fileName, const string &mediaType)
 {
     ASiContainer::addDataFileChecks(fileName, mediaType);
     if(!dataFiles().empty())
diff --git a/src/ASiC_S.h b/src/ASiC_S.h
@@ -44,7 +44,7 @@ namespace digidoc
         ASiC_S(const std::string &path, bool create);
         DISABLE_COPY(ASiC_S);
 
-        void addDataFileChecks(const std::string &path, const std::string &mediaType) override;
+        void addDataFileChecks(std::string_view path, const std::string &mediaType) override;
         void canSave() final;
         void save(const ZipSerialize &s) final;
 
diff --git a/src/ASiContainer.cpp b/src/ASiContainer.cpp
@@ -146,7 +146,7 @@ vector<Signature *> ASiContainer::signatures() const
  */
 void ASiContainer::addDataFile(const string &path, const string &mediaType)
 {
-    string fileName = File::fileName(path);
+    auto fileName = File::fileName(path);
     addDataFileChecks(fileName, mediaType);
     auto nativePath = File::encodeName(path);
     auto size = File::fileSize(nativePath);
@@ -162,8 +162,8 @@ void ASiContainer::addDataFile(const string &path, const string &mediaType)
         *data << is->rdbuf();
         is = std::move(data);
     }
-    d->properties[fileName] = { appInfo(), File::modifiedTime(path), size };
-    d->documents.push_back(new DataFilePrivate(std::move(is), std::move(fileName), mediaType));
+    d->properties[string(fileName)] = { appInfo(), File::modifiedTime(path), size };
+    d->documents.push_back(new DataFilePrivate(std::move(is), string(fileName), mediaType));
 }
 
 void ASiContainer::addDataFile(unique_ptr<istream> is, const string &fileName, const string &mediaType)
@@ -197,15 +197,15 @@ void ASiContainer::validateDataFilePath(string_view fileName)
     }
 }
 
-void ASiContainer::addDataFileChecks(const string &fileName, const string &mediaType)
+void ASiContainer::addDataFileChecks(string_view fileName, const string &mediaType)
 {
     if(!d->signatures.empty())
         THROW("Can not add document to container which has signatures, remove all signatures before adding new document.");
     if(fileName == "mimetype")
         THROW("mimetype is reserved file.");
     validateDataFileName(fileName);
     if(any_of(d->documents.cbegin(), d->documents.cend(), [&](DataFile *file) { return fileName == file->fileName(); }))
-        THROW("Document with same file name '%s' already exists.", fileName.c_str());
+        THROW("Document with same file name '%.*s' already exists.", STR_VIEW_FMT(fileName));
     if(mediaType.find('/') == string::npos)
         THROW("MediaType does not meet format requirements (RFC2045, section 5.1) '%s'.", mediaType.c_str());
 }
diff --git a/src/ASiContainer.h b/src/ASiContainer.h
@@ -62,7 +62,7 @@ namespace digidoc
           std::string path() const override;
           ASiContainer(const std::string &path, std::string_view mimetype);
 
-          virtual void addDataFileChecks(const std::string &path, const std::string &mediaType);
+          virtual void addDataFileChecks(std::string_view path, const std::string &mediaType);
           void addDataFilePrivate(const ZipSerialize &z, std::string_view filename, std::string_view mediatype);
           Signature* addSignature(std::unique_ptr<Signature> &&signature);
           virtual void canSave() = 0;
diff --git a/src/DataFile.cpp b/src/DataFile.cpp
@@ -119,7 +119,7 @@ DataFilePrivate::DataFilePrivate(const ZipSerialize &z, string filename, string
                 if(currentStreamSize + size > r.size)
                     THROW("ZIP entry actual size exceeds uncompressed_size %zu", r.size);
                 if(!fs->write(buf.data(), size))
-                    THROW("Failed to write '%s' data to stream. Stream size: %d", m_filename.c_str(), currentStreamSize);
+                    THROW("Failed to write '%s' data to stream. Stream size: %zu", m_filename.c_str(), currentStreamSize);
             }
             if(!fs->flush())
                 THROW("Failed to flush '%s' data to temporary file.", m_filename.c_str());
diff --git a/src/SiVaContainer.cpp b/src/SiVaContainer.cpp
@@ -118,7 +118,7 @@ SiVaContainer::SiVaContainer(const string &path, ContainerOpenCB *cb, bool useHa
     else if(File::fileExtension(path, {"pdf"}))
     {
         d->mediaType = "application/pdf";
-        d->dataFiles.push_back(new DataFilePrivate(std::move(ifs), fileName, "application/pdf"));
+        d->dataFiles.push_back(new DataFilePrivate(std::move(ifs), string(fileName), "application/pdf"));
     }
     else if(File::fileExtension(path, {"asice", "sce", "asics", "scs"}))
     {
diff --git a/src/SignatureTST.cpp b/src/SignatureTST.cpp
@@ -61,7 +61,8 @@ struct SignatureTST::Data {
         if (auto it = cache->find(method); it != cache->cend()) {
             return it->second;
         }
-        return (*cache)[std::move(method)] = digest(Digest(method)).result();
+        auto result = digest(Digest(method)).result();
+        return (*cache)[std::move(method)] = std::move(result);
     }
 };
 
@@ -82,7 +83,8 @@ SignatureTST::SignatureTST(bool manifest, const ZipSerialize &z, ASiC_S *asicSDo
             auto ref = doc/"SigReference";
             string uri = util::File::fromUriPath(ref["URI"]);
             metadata.emplace_back(std::move(file), std::move(mime), xml.str());
-            metadata.emplace_back(std::move(uri), string(ref["MimeType"]), z.read(uri));
+            auto refData = z.read(uri);
+            metadata.emplace_back(std::move(uri), string(ref["MimeType"]), std::move(refData));
             file.clear();
 
             for(auto ref = doc/"DataObjectReference"; ref; ref++)
@@ -172,7 +174,7 @@ void SignatureTST::extendSignatureProfile(Signer *signer)
     }, true);
     auto i = metadata.insert(metadata.cbegin(), {"META-INF/ASiCArchiveManifest.xml", "text/xml", std::move(data)});
     vector<unsigned char> der = TS(i->digest(), signer->userAgent());
-    metadata.insert(next(i), {tstName, TST_MIMETYPE, string{der.cbegin(), der.cend()}});
+    metadata.insert(next(i), {std::move(tstName), TST_MIMETYPE, string{der.cbegin(), der.cend()}});
 }
 
 X509Cert SignatureTST::TimeStampCertificate() const
diff --git a/src/crypto/PKCS11Signer.cpp b/src/crypto/PKCS11Signer.cpp
@@ -99,10 +99,10 @@ static auto PKCS11List(CK_FUNCTION_LIST *f, Args&&... args)
     using T = std::remove_pointer_t<std::tuple_element_t<Traits::nargs - 2, typename Traits::arg_types>>;
     std::vector<T> result;
     CK_ULONG count = 0;
-    if((f->*Getter)(std::forward<Args>(args)..., static_cast<T*>(nullptr), &count) != CKR_OK || count == 0)
+    if((f->*Getter)(args..., static_cast<T*>(nullptr), &count) != CKR_OK || count == 0)
         return result;
     result.resize(size_t(count));
-    if((f->*Getter)(std::forward<Args>(args)..., result.data(), &count) != CKR_OK)
+    if((f->*Getter)(args..., result.data(), &count) != CKR_OK)
         result.clear();
     return result;
 }
diff --git a/src/util/File.cpp b/src/util/File.cpp
@@ -63,7 +63,7 @@ using f_utimbuf = struct utimbuf;
 #endif
 
 
-static string decodeName(fs::path path)
+static string decodeName(const fs::path &path)
 {
     auto name = path.u8string();
     return {reinterpret_cast<const char*>(name.data()), name.size()};
@@ -148,7 +148,7 @@ bool File::fileExtension(string_view path, initializer_list<string_view> list)
 /**
  * Returns file size
  */
-unsigned long File::fileSize(const std::filesystem::path &path) noexcept
+unsigned long File::fileSize(const fs::path &path) noexcept
 {
     error_code ec;
     auto result = fs::file_size(path, ec);
@@ -161,7 +161,7 @@ unsigned long File::fileSize(const std::filesystem::path &path) noexcept
  * @param path full path of the file.
  * @return returns file name from the file full path in UTF-8.
  */
-string File::fileName(const string& path)
+string_view File::fileName(string_view path) noexcept
 {
     size_t pos = path.find_last_of("/\\");
     return pos == string::npos ? path : path.substr(pos + 1);
@@ -330,8 +330,8 @@ constexpr bool fromHexChar(auto pos, auto end, auto &value)
 {
     if(distance(pos, end) < 2)
         return false;
-    auto *p = &*pos;
-    return from_chars(p, p + 2, value, 16).ec == std::errc{};
+    auto *p = to_address(pos);
+    return from_chars(p, p + 2, value, 16).ec == errc{};
 }
 
 string File::fromUriPath(string_view path)
diff --git a/src/util/File.h b/src/util/File.h
@@ -41,7 +41,7 @@ namespace digidoc
               static bool fileExists(const std::string& path);
               static bool fileExtension(std::string_view path, std::initializer_list<std::string_view> list);
               static unsigned long fileSize(const std::filesystem::path &path) noexcept;
-              static std::string fileName(const std::string& path);
+              static std::string_view fileName(std::string_view path) noexcept;
               static std::string directory(const std::string& path);
               static std::string path(std::string dir, std::string_view relativePath);
               static std::filesystem::path tempFileName();
diff --git a/src/util/log.cpp b/src/util/log.cpp
@@ -69,39 +69,65 @@ string Log::formatArgList(const char* fmt, va_list args)
     return result;
 }
 
+static ostream &logStream(Conf *conf) noexcept
+{
+    static fstream f;
+    static string lastPath;
+    try {
+        const auto &path = conf->logFile();
+        if(path != lastPath)
+        {
+            lastPath = path;
+            f.close();
+            if(!path.empty())
+                f.open(File::encodeName(path), fstream::out|fstream::app);
+        }
+    }
+    catch(const exception &e)
+    {
+        f.close();
+        cerr << "Failed to open log file '" << lastPath << "': " << e.what() << '\n';
+    }
+    return f.is_open() ? static_cast<ostream &>(f) : cout;
+}
+
 void Log::out(LogType type, const char *file, unsigned int line, const char *format, ...)
 {
     Conf *conf = Conf::instance();
     if(!conf || conf->logLevel() < type)
         return;
 
-    ostream *o = &cout;
-    fstream f;
-    if(!conf->logFile().empty())
-    {
-        f.open(File::encodeName(conf->logFile()), fstream::out|fstream::app);
-        o = &f;
-    }
+    ostream &o = logStream(conf);
     time_t t = time(nullptr);
     tm tm {};
 #ifdef _WIN32
     gmtime_s(&tm, &t);
 #else
     gmtime_r(&t, &tm);
 #endif
-    *o << put_time(&tm, "%Y-%m-%dT%TZ") << ' ';
+    o << put_time(&tm, "%Y-%m-%dT%TZ") << ' ';
     switch(type)
     {
-    case ErrorType: *o << 'E'; break;
-    case WarnType: *o << 'W'; break;
-    case InfoType: *o << 'I'; break;
-    case DebugType: *o << 'D'; break;
+    case ErrorType: o << 'E'; break;
+    case WarnType: o << 'W'; break;
+    case InfoType: o << 'I'; break;
+    case DebugType: o << 'D'; break;
     }
-    *o << " [" << File::fileName(file) << ':' << line << "] - ";
+    o << " [" << File::fileName(file) << ':' << line << "] - ";
 
     va_list args{};
     va_start(args, format);
-    *o << formatArgList(format, args) << '\n';
+    try {
+        if(string_view(format).contains('%'))
+            o << formatArgList(format, args) << '\n';
+        else
+            o << format << '\n';
+    }
+    catch(const exception &e)
+    {
+        cerr << "Failed to format log message: " << e.what() << '\n';
+        o << format << '\n';
+    }
     va_end(args);
 }
 
@@ -111,17 +137,10 @@ void Log::dbgPrintfMemImpl(const char *msg, const unsigned char *data, size_t si
     if(!conf || conf->logLevel() < DebugType)
         return;
 
-    ostream *o = &cout;
-    fstream f;
-    if(!conf->logFile().empty())
-    {
-        f.open(File::encodeName(conf->logFile()), fstream::out|fstream::app);
-        o = &f;
-    }
-
-    *o << "DEBUG [" << File::fileName(file) << ':' << line << "] - " << msg << " { ";
-    *o << hex << uppercase << setfill('0');
+    ostream &o = logStream(conf);
+    o << "DEBUG [" << File::fileName(file) << ':' << line << "] - " << msg << " { ";
+    o << hex << uppercase << setfill('0');
     for(size_t i = 0; i < size; ++i)
-        *o << setw(2) << static_cast<int>(data[i]) << ' ';
-    *o << dec << nouppercase << setfill(' ') << "}:" << size << '\n';
+        o << setw(2) << static_cast<int>(data[i]) << ' ';
+    o << dec << nouppercase << setfill(' ') << "}:" << size << '\n';
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ ASiC_S::ASiC_S(const string &path, bool create)`
`85`	`85`	`THROW("ASiC-S container does not contain any signatures.");`
`86`	`86`	`}`
`87`	`87`
`88`		`-void ASiC_S::addDataFileChecks(const string &fileName, const string &mediaType)`
	`88`	`+void ASiC_S::addDataFileChecks(string_view fileName, const string &mediaType)`
`89`	`89`	`{`
`90`	`90`	`ASiContainer::addDataFileChecks(fileName, mediaType);`
`91`	`91`	`if(!dataFiles().empty())`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ vector<Signature *> ASiContainer::signatures() const`
`146`	`146`	`*/`
`147`	`147`	`void ASiContainer::addDataFile(const string &path, const string &mediaType)`
`148`	`148`	`{`
`149`		`- string fileName = File::fileName(path);`
	`149`	`+ auto fileName = File::fileName(path);`
`150`	`150`	`addDataFileChecks(fileName, mediaType);`
`151`	`151`	`auto nativePath = File::encodeName(path);`
`152`	`152`	`auto size = File::fileSize(nativePath);`
`@@ -162,8 +162,8 @@ void ASiContainer::addDataFile(const string &path, const string &mediaType)`
`162`	`162`	`*data << is->rdbuf();`
`163`	`163`	`is = std::move(data);`
`164`	`164`	`}`
`165`		`- d->properties[fileName] = { appInfo(), File::modifiedTime(path), size };`
`166`		`- d->documents.push_back(new DataFilePrivate(std::move(is), std::move(fileName), mediaType));`
	`165`	`+ d->properties[string(fileName)] = { appInfo(), File::modifiedTime(path), size };`
	`166`	`+ d->documents.push_back(new DataFilePrivate(std::move(is), string(fileName), mediaType));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`void ASiContainer::addDataFile(unique_ptr<istream> is, const string &fileName, const string &mediaType)`
`@@ -197,15 +197,15 @@ void ASiContainer::validateDataFilePath(string_view fileName)`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`200`		`-void ASiContainer::addDataFileChecks(const string &fileName, const string &mediaType)`
	`200`	`+void ASiContainer::addDataFileChecks(string_view fileName, const string &mediaType)`
`201`	`201`	`{`
`202`	`202`	`if(!d->signatures.empty())`
`203`	`203`	`THROW("Can not add document to container which has signatures, remove all signatures before adding new document.");`
`204`	`204`	`if(fileName == "mimetype")`
`205`	`205`	`THROW("mimetype is reserved file.");`
`206`	`206`	`validateDataFileName(fileName);`
`207`	`207`	`if(any_of(d->documents.cbegin(), d->documents.cend(), [&](DataFile *file) { return fileName == file->fileName(); }))`
`208`		`- THROW("Document with same file name '%s' already exists.", fileName.c_str());`
	`208`	`+ THROW("Document with same file name '%.*s' already exists.", STR_VIEW_FMT(fileName));`
`209`	`209`	`if(mediaType.find('/') == string::npos)`
`210`	`210`	`THROW("MediaType does not meet format requirements (RFC2045, section 5.1) '%s'.", mediaType.c_str());`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ DataFilePrivate::DataFilePrivate(const ZipSerialize &z, string filename, string`
`119`	`119`	`if(currentStreamSize + size > r.size)`
`120`	`120`	`THROW("ZIP entry actual size exceeds uncompressed_size %zu", r.size);`
`121`	`121`	`if(!fs->write(buf.data(), size))`
`122`		`- THROW("Failed to write '%s' data to stream. Stream size: %d", m_filename.c_str(), currentStreamSize);`
	`122`	`+ THROW("Failed to write '%s' data to stream. Stream size: %zu", m_filename.c_str(), currentStreamSize);`
`123`	`123`	`}`
`124`	`124`	`if(!fs->flush())`
`125`	`125`	`THROW("Failed to flush '%s' data to temporary file.", m_filename.c_str());`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ SiVaContainer::SiVaContainer(const string &path, ContainerOpenCB *cb, bool useHa`
`118`	`118`	`else if(File::fileExtension(path, {"pdf"}))`
`119`	`119`	`{`
`120`	`120`	`d->mediaType = "application/pdf";`
`121`		`- d->dataFiles.push_back(new DataFilePrivate(std::move(ifs), fileName, "application/pdf"));`
	`121`	`+ d->dataFiles.push_back(new DataFilePrivate(std::move(ifs), string(fileName), "application/pdf"));`
`122`	`122`	`}`
`123`	`123`	`else if(File::fileExtension(path, {"asice", "sce", "asics", "scs"}))`
`124`	`124`	`{`