From 6e3ce737ba3b189fccb386dc702ca1fb2f4f6867 Mon Sep 17 00:00:00 2001
From: Georgiy Komarov <jubnzv@gmail.com>
Date: Thu, 22 Jul 2021 19:54:43 +0300
Subject: [PATCH] gui: Fix suppressions by file with the relative paths (#3349)

If the user enters the path that potentially could be relative, we are
trying to replace it with the absolute one.

Reported in the forum:
https://sourceforge.net/p/cppcheck/discussion/general/thread/311ed96e68/

Fixes Trac ticket #10377.
---
 gui/projectfiledialog.cpp | 43 ++++++++++++++++++++++++++++++++-------
 gui/projectfiledialog.h   |  6 ++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 944361ca4..80c205a33 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -670,17 +670,46 @@ void ProjectFileDialog::setLibraries(const QStringList &libraries)
     }
 }
 
-void ProjectFileDialog::setSuppressions(const QList<Suppressions::Suppression> &suppressions)
+void ProjectFileDialog::addSingleSuppression(const Suppressions::Suppression &suppression)
 {
-    mSuppressions = suppressions;
+    QString suppression_name;
+    static char sep = QDir::separator().toLatin1();
+    bool found_relative = false;
 
-    QStringList s;
-    foreach (const Suppressions::Suppression &suppression, mSuppressions) {
-        s << QString::fromStdString(suppression.getText());
+    // Replace relative file path in the suppression with the absolute one
+    if ((suppression.fileName.find("*") == std::string::npos) &&
+        (suppression.fileName.find(sep) == std::string::npos)) {
+        QFileInfo inf(mProjectFile->getFilename());
+        QString rootpath = inf.absolutePath();
+        if (QFile::exists(QString{"%1%2%3"}.arg(rootpath,
+                                                QDir::separator(),
+                                                QString::fromStdString(suppression.fileName)))) {
+            Suppressions::Suppression sup = suppression;
+            sup.fileName = rootpath.toLatin1().constData();
+            sup.fileName += sep;
+            sup.fileName += suppression.fileName;
+            mSuppressions += sup;
+            suppression_name = QString::fromStdString(sup.getText());
+            found_relative = true;
+        }
     }
 
+    if (!found_relative) {
+        mSuppressions += suppression;
+        suppression_name = QString::fromStdString(suppression.getText());
+    }
+
+    mUI.mListSuppressions->addItem(suppression_name);
+}
+
+void ProjectFileDialog::setSuppressions(const QList<Suppressions::Suppression> &suppressions)
+{
     mUI.mListSuppressions->clear();
-    mUI.mListSuppressions->addItems(s);
+    QList<Suppressions::Suppression> new_suppressions = suppressions;
+    mSuppressions.clear();
+    foreach (const Suppressions::Suppression &suppression, new_suppressions) {
+        addSingleSuppression(suppression);
+    }
     mUI.mListSuppressions->sortItems();
 }
 
@@ -775,7 +804,7 @@ void ProjectFileDialog::addSuppression()
 {
     NewSuppressionDialog dlg;
     if (dlg.exec() == QDialog::Accepted) {
-        setSuppressions(mSuppressions << dlg.getSuppression());
+        addSingleSuppression(dlg.getSuppression());
     }
 }
 
diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h
index 7cb6423d6..f7a951075 100644
--- a/gui/projectfiledialog.h
+++ b/gui/projectfiledialog.h
@@ -157,6 +157,12 @@ private:
     */
     void setLibraries(const QStringList &libraries);
 
+    /**
+    * @brief Add a single suppression to dialog control.
+    * @param suppression A suppressions to add to dialog control.
+    */
+    void addSingleSuppression(const Suppressions::Suppression &suppression);
+
     /**
     * @brief Set suppressions to dialog control.
     * @param suppressions List of suppressions to set to dialog control.