Skip to content

Commit aeec3d2

Browse files
committed
gcc-parser: append [-Wanalyzer-*] to key event ID
... in GCC_ANALYZER_WARNING reports
1 parent e3b70fa commit aeec3d2

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

gcc-parser.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ bool BasicGccParser::hasError() const {
539539
class PostProcessor {
540540
public:
541541
PostProcessor():
542-
reGccAnalCoreEvt_("^(.*) \\[-Wanalyzer-[A-Za-z0-9-]+\\]$"),
542+
reGccAnalCoreEvt_("^(.*) (\\[-Wanalyzer-[A-Za-z0-9-]+\\])$"),
543543
reGccAnalCwe_("^.* \\[CWE-([0-9]+)\\]$")
544544
{
545545
}
@@ -567,6 +567,7 @@ void PostProcessor::transGccAnal(Defect *pDef) {
567567

568568
// COMPILER_WARNING -> GCC_ANALYZER_WARNING
569569
pDef->checker = "GCC_ANALYZER_WARNING";
570+
keyEvt.event += sm[/* id */ 2];
570571

571572
// pick CWE number if available
572573
const std::string rawMsg = sm[/* msg */ 1];

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Error: COMPILER_WARNING:
6262

6363
Error: GCC_ANALYZER_WARNING (CWE-690):
6464
/builddir/build/BUILD/curl-7.70.0/lib/multi.c: scope_hint: In function 'multi_runsingle'
65-
/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning: dereference of NULL 'conn' [CWE-690] [-Wanalyzer-null-dereference]
65+
/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]
6666
# 1701 | dns = Curl_fetch_addr(conn, hostname, (int)conn->port);
6767
# | ~~~~^~~~~~
6868
/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
245245

246246
Error: GCC_ANALYZER_WARNING (CWE-690):
247247
/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c: scope_hint: In function 'tool_header_cb'
248-
/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning: use of NULL '<unknown>' where non-null expected [CWE-690] [-Wanalyzer-null-argument]
248+
/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]
249249
# 241 | fwrite(ptr, cb, 1, outs->stream);
250250
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
251251
/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:
438438

439439
Error: GCC_ANALYZER_WARNING (CWE-690):
440440
/builddir/build/BUILD/curl-7.70.0/lib/multi.c: scope_hint: In function 'multi_runsingle'
441-
/builddir/build/BUILD/curl-7.70.0/lib/multi.c:1701:54: warning: dereference of NULL 'conn' [CWE-690] [-Wanalyzer-null-dereference]
441+
/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]
442442
# 1701 | dns = Curl_fetch_addr(conn, hostname, (int)conn->port);
443443
# | ~~~~^~~~~~
444444
/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
621621

622622
Error: GCC_ANALYZER_WARNING (CWE-690):
623623
/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c: scope_hint: In function 'tool_header_cb'
624-
/builddir/build/BUILD/curl-7.70.0/src/tool_cb_hdr.c:241:7: warning: use of NULL '<unknown>' where non-null expected [CWE-690] [-Wanalyzer-null-argument]
624+
/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]
625625
# 241 | fwrite(ptr, cb, 1, outs->stream);
626626
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
627627
/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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"file_name": "/builddir/build/BUILD/systemtap-4.4/staprun/relay.c",
8484
"line": 60,
8585
"column": 16,
86-
"event": "warning",
86+
"event": "warning[-Wanalyzer-malloc-leak]",
8787
"message": "leak of '<unknown>' [CWE-401] [-Wanalyzer-malloc-leak]",
8888
"verbosity_level": "0"
8989
},

0 commit comments

Comments
 (0)