walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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.
This commit is contained in:
Georgiy Komarov 2021-07-22 19:54:43 +03:00 committed by GitHub
parent 48031ffb3b
commit 6e3ce737ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gui/projectfiledialog.cpp
View File

@ -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; // Replace relative file path in the suppression with the absolute one
foreach (const Suppressions::Suppression &suppression, mSuppressions) { if ((suppression.fileName.find("*") == std::string::npos) &&
s << QString::fromStdString(suppression.getText()); (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->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(); mUI.mListSuppressions->sortItems();
} }
@ -775,7 +804,7 @@ void ProjectFileDialog::addSuppression()
{ {
NewSuppressionDialog dlg; NewSuppressionDialog dlg;
if (dlg.exec() == QDialog::Accepted) { if (dlg.exec() == QDialog::Accepted) {
setSuppressions(mSuppressions << dlg.getSuppression()); addSingleSuppression(dlg.getSuppression());
} }
} }

6
gui/projectfiledialog.h
View File

@ -157,6 +157,12 @@ private:
*/ */
void setLibraries(const QStringList &libraries); 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. * @brief Set suppressions to dialog control.
* @param suppressions List of suppressions to set to dialog control. * @param suppressions List of suppressions to set to dialog control.