fixed #14309 - report inline suppressions without an error ID [skip ci]

Author: firewave

lib/preprocessor.cpp

@@ -88,8 +88,10 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
     const std::string::size_type pos1 = comment.find_first_not_of("/* \t");
     if (pos1 == std::string::npos)
         return false;
-    if (pos1 + cppchecksuppress.size() >= comment.size())
+    if (pos1 + cppchecksuppress.size() >= comment.size()) {
+        bad.emplace_back(tok->location.file(), tok->location.line, 0, "suppression without error ID");
         return false;
+    }
     if (comment.substr(pos1, cppchecksuppress.size()) != cppchecksuppress)
         return false;
 
@@ -98,8 +100,10 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
 
     // skip spaces after "cppcheck-suppress" and its possible prefix
     const std::string::size_type pos2 = comment.find_first_not_of(' ', posEndComment);
-    if (pos2 == std::string::npos)
+    if (pos2 == std::string::npos) {
+        bad.emplace_back(tok->location.file(), tok->location.line, 0, "suppression without error ID");
         return false;
+    }
 
     SuppressionList::Type errorType = SuppressionList::Type::unique;
 
@@ -142,9 +146,11 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
             s.lineNumber = tok->location.line;
         }
 
+        // TODO: unreachable?
         if (!errmsg.empty())
             bad.emplace_back(tok->location.file(), tok->location.line, tok->location.col, std::move(errmsg));
 
+        // TODO: report ones without ID - unreachable?
         std::copy_if(suppressions.cbegin(), suppressions.cend(), std::back_inserter(inlineSuppressions), [](const SuppressionList::Suppression& s) {
             return !s.errorId.empty();
         });
@@ -159,9 +165,11 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
         s.type = errorType;
         s.lineNumber = tok->location.line;
 
+        // TODO: report when no ID - unreachable?
         if (!s.errorId.empty())
             inlineSuppressions.push_back(std::move(s));
 
+        // TODO: unreachable?
         if (!errmsg.empty())
             bad.emplace_back(tok->location.file(), tok->location.line, tok->location.col, std::move(errmsg));
     }

test/testsuppressions.cpp

@@ -716,6 +716,37 @@ class TestSuppressions : public TestFixture {
                       "[test.cpp:6:0]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
                       "[test.cpp:4:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
 
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file\n"
+                                        "// cppcheck-suppress\n"
+                                        "// cppcheck-suppress \n"
+                                        "// cppcheck-suppress\t\n"
+                                        "// cppcheck-suppress-begin\n"
+                                        "// cppcheck-suppress-begin id0\n"
+                                        "void f() {}\n"
+                                        "// cppcheck-suppress-end\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:5:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:8:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress:\n"
+                                        "// cppcheck-suppress-unknown\n"
+                                        "// cppcheck-suppress-begin-unknown\n"
+                                        "// cppcheck-suppress-begin\n"
+                                        "void f() {}\n"
+                                        "// cppcheck-suppress-end-unknown\n",
+                                        ""));
+        // TODO: actually these are all invalid types
+        ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n", errout_str());
+
         ASSERT_EQUALS(1, (this->*check)("void f() {\n"
                                         "    int a;\n"
                                         "    // cppcheck-suppress-begin uninitvar\n"