Fix coverity errors

WE2-1003 Signed-off-by: Raul Metsma <[email protected]>
web-eid · Feb 6, 2025 · 9fd7a8b · 9fd7a8b
1 parent 632830c
commit 9fd7a8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/libelectronic-id b/lib/libelectronic-id
diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp
@@ -478,7 +478,7 @@ void WebEidDialog::onVerifyPinFailed(const VerifyPinFailed::Status status, const
         break;
     case Status::UNKNOWN_ERROR:
         message = [] { return tr("Technical error"); };
-        displayFatalError(message);
+        displayFatalError(std::move(message));
         return;
     }
 
@@ -682,14 +682,15 @@ void WebEidDialog::displayPinBlockedError()
     displayFatalError([] { return tr("PIN is locked. Unblock and try again."); });
 }
 
-void WebEidDialog::displayFatalError(std::function<QString()> message)
+template <typename Text>
+void WebEidDialog::displayFatalError(Text message)
 {
     ui->pinTitleLabel->hide();
     ui->pinInput->hide();
     ui->pinTimeoutTimer->stop();
     ui->pinTimeRemaining->hide();
     ui->pinEntryTimeoutProgressBar->hide();
-    setTrText(ui->pinErrorLabel, message);
+    setTrText(ui->pinErrorLabel, std::forward<Text>(message));
     ui->pinErrorLabel->show();
     ui->okButton->hide();
     ui->cancelButton->setEnabled(true);

diff --git a/src/ui/webeiddialog.hpp b/src/ui/webeiddialog.hpp
@@ -104,7 +104,8 @@ class WebEidDialog final : public WebEidUI
     template <typename Func>
     void setupOK(Func func, const char* text = {}, bool enabled = false);
     void displayPinBlockedError();
-    void displayFatalError(std::function<QString()> message);
+    template <typename Text>
+    void displayFatalError(Text message);
 
     void showPinInputWarning(bool show);
     void resizeHeight();
+1 −1		lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp
+6 −24		lib/libpcsc-cpp/src/listReaders.cpp
+1 −1		lib/libpcsc-cpp/src/utils.cpp