gcc-parser: drop parsed sufffix from msg text

... in GCC_ANALYZER_WARNING reports

Author: kdudka

gcc-parser.cc

@@ -540,7 +540,7 @@ class PostProcessor {
     public:
         PostProcessor():
             reGccAnalCoreEvt_("^(.*) (\\[-Wanalyzer-[A-Za-z0-9-]+\\])$"),
-            reGccAnalCwe_("^.* \\[CWE-([0-9]+)\\]$")
+            reGccAnalCwe_("^(.*) \\[CWE-([0-9]+)\\]$")
         {
         }
 
@@ -568,11 +568,16 @@ void PostProcessor::transGccAnal(Defect *pDef) {
     // COMPILER_WARNING -> GCC_ANALYZER_WARNING
     pDef->checker = "GCC_ANALYZER_WARNING";
     keyEvt.event += sm[/* id */ 2];
+    // this invalidates sm
+    keyEvt.msg = sm[/* msg */ 1];
 
     // pick CWE number if available
-    const std::string rawMsg = sm[/* msg */ 1];
-    if (boost::regex_match(rawMsg, sm, reGccAnalCwe_))
-        pDef->cwe = parse_int(sm[/* cwe */ 1]);
+    if (!boost::regex_match(keyEvt.msg, sm, reGccAnalCwe_))
+        return;
+
+    pDef->cwe = parse_int(sm[/* cwe */ 2]);
+    // this invalidates sm
+    keyEvt.msg = sm[/* msg */ 1];
 }
 
 void PostProcessor::apply(Defect *pDef) {

tests/csgrep/57-gcc-parser-gcc-analyzer-curl-stdout.txt

@@ -62,7 +62,7 @@ Error: COMPILER_WARNING:
 
 Error: GCC_ANALYZER_WARNING (CWE-690):
 /builddir/build/BUILD/curl-7.70.0/lib/multi.c: scope_hint: In function 'multi_runsingle'
-/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning[-Wanalyzer-null-dereference]: dereference of NULL 'conn' [CWE-690] [-Wanalyzer-null-dereference]
+/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning[-Wanalyzer-null-dereference]: dereference of NULL 'conn'
 # 1701 |       dns = Curl_fetch_addr(conn, hostname, (int)conn->port);
 #      |                                                  ~~~~^~~~~~
 /builddir/build/BUILD/curl-7.70.0/lib/multi.c:2962:11: note: (1) entry to 'curl_multi_socket_all'
@@ -245,7 +245,7 @@ cc1: note: (44) ...to here
 
 Error: GCC_ANALYZER_WARNING (CWE-690):
 /builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c: scope_hint: In function 'tool_header_cb'
-/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning[-Wanalyzer-null-argument]: use of NULL '<unknown>' where non-null expected [CWE-690] [-Wanalyzer-null-argument]
+/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning[-Wanalyzer-null-argument]: use of NULL '<unknown>' where non-null expected
 #  241 |       fwrite(ptr, cb, 1, outs->stream);
 #      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:56:8: note: (1) entry to 'tool_header_cb'
@@ -438,7 +438,7 @@ Error: COMPILER_WARNING:
 
 Error: GCC_ANALYZER_WARNING (CWE-690):
 /builddir/build/BUILD/curl-7.70.0/lib/multi.c: scope_hint: In function 'multi_runsingle'
-/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning[-Wanalyzer-null-dereference]: dereference of NULL 'conn' [CWE-690] [-Wanalyzer-null-dereference]
+/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning[-Wanalyzer-null-dereference]: dereference of NULL 'conn'
 # 1701 |       dns = Curl_fetch_addr(conn, hostname, (int)conn->port);
 #      |                                                  ~~~~^~~~~~
 /builddir/build/BUILD/curl-7.70.0/lib/multi.c:2962:11: note: (1) entry to 'curl_multi_socket_all'
@@ -621,7 +621,7 @@ cc1: note: (44) ...to here
 
 Error: GCC_ANALYZER_WARNING (CWE-690):
 /builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c: scope_hint: In function 'tool_header_cb'
-/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning[-Wanalyzer-null-argument]: use of NULL '<unknown>' where non-null expected [CWE-690] [-Wanalyzer-null-argument]
+/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning[-Wanalyzer-null-argument]: use of NULL '<unknown>' where non-null expected
 #  241 |       fwrite(ptr, cb, 1, outs->stream);
 #      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:56:8: note: (1) entry to 'tool_header_cb'

tests/csgrep/63-gcc-parser-checker-lang-stdout.txt

@@ -84,7 +84,7 @@
                     "line": 60,
                     "column": 16,
                     "event": "warning[-Wanalyzer-malloc-leak]",
-                    "message": "leak of '<unknown>' [CWE-401] [-Wanalyzer-malloc-leak]",
+                    "message": "leak of '<unknown>'",
                     "verbosity_level": "0"
                 },
                 {