diff --git a/cppcheck_suppressions.conf b/cppcheck_suppressions.conf index 2f3b87e03..0fddc704f 100644 --- a/cppcheck_suppressions.conf +++ b/cppcheck_suppressions.conf @@ -16,11 +16,17 @@ uninitMemberVar:src/blackmisc/optional.h unusedPrivateFunction:src/blackmisc/tuple_private.h unusedPrivateFunction:src/blackmisc/blackmiscfreefunctions.h unusedPrivateFunction:src/blackmisc/compare.h +unusedPrivateFunction:src/blackmisc/lockfree.h + +unusedPrivateFunction:src/blackmisc/dictionary.h // cppcheck shouldn’t assume operator* is commutative duplicateExpression:tests/blackmisc/testvectormatrix.cpp duplicateExpression:tests/blackmisc/testphysicalquantities.cpp +// Ignore intentional hiding +variableHidingEnum:src/blackmisc/statusmessage.h + // Ignore any preprocessor directives. preprocessorErrorDirective diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index 465ca00c7..01492f485 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -256,6 +256,7 @@ namespace BlackMisc { QJsonValueRef jsonKey = (*it); ++it; + if (it == array.end()) { qWarning("Odd number of elements in CDictionary::convertFromJson"); return; } QJsonValueRef jsonValue = (*it); Key key; Value value;