From c5ebf26f9f972e9fd3a758ae62f9924618c121ec Mon Sep 17 00:00:00 2001
From: Kevin Kendzia <kevin.kendzia@gmail.com>
Date: Fri, 17 Aug 2018 10:05:25 +0200
Subject: [PATCH] cppcheck.cpp: fix suppression of syntaxError (#1333)

* cppcheck.cpp: fix suppression of syntaxError

* test: add supression test for syntaxError while file read
---
 lib/cppcheck.cpp          |  4 ++--
 test/testsuppressions.cpp | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index b5f48723e..182edeba1 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -174,8 +174,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
                                                  it->msg,
                                                  "syntaxError",
                                                  false);
-                mErrorLogger.reportErr(errmsg);
-                return 1;
+                reportErr(errmsg);
+                return mExitCode;
             }
         }
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index f3b8c389f..167f640b5 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -58,7 +58,7 @@ private:
         TEST_CASE(suppressionWithRelativePaths); // #4733
         TEST_CASE(suppressingSyntaxErrors); // #7076
         TEST_CASE(suppressingSyntaxErrorsInline); // #5917
-
+        TEST_CASE(suppressingSyntaxErrorsWhileFileRead) // PR #1333
         TEST_CASE(symbol);
 
         TEST_CASE(unusedFunction);
@@ -523,6 +523,25 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void suppressingSyntaxErrorsWhileFileRead() { // syntaxError while file read should be suppressable (PR #1333)
+        std::map<std::string, std::string> files;
+        files["test.cpp"] = "CONST (genType, KS_CONST) genService[KS_CFG_NR_OF_NVM_BLOCKS] =\n"
+                            "{\n"
+                            "[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
+                            "[!IF \"(as:modconf('Ks')[1]/KsGeneral/KsType = 'KS_CFG_TYPE_KS_MASTER') and\n"
+                            "      (as:modconf('Ks')[1]/KsGeneral/KsUseShe = 'true')\"!][!//\n"
+                            "  {\n"
+                            "      &varNB_GetErrorStatus,\n"
+                            "      &varNB_WriteBlock,\n"
+                            "      &varNB_ReadBlock\n"
+                            "  },\n"
+                            "[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
+                            "[!ENDIF!][!//\n"
+                            "};";
+        checkSuppression(files, "syntaxError:test.cpp:4");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void symbol() {
         Suppressions::Suppression s;
         s.errorId = "foo";