From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id 15BAC38582AE; Thu, 16 Jun 2022 21:28:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15BAC38582AE MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1143] analyzer: associate -Wanalyzer-double-fclose with CWE-1341 X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: 753aaa949ab9a32ce57c9e4f73315a9b2f90c326 X-Git-Newrev: 065d191893234c1b2e4554fd78ba339d9b7d03e9 Message-Id: <20220616212812.15BAC38582AE@sourceware.org> Date: Thu, 16 Jun 2022 21:28:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2022 21:28:12 -0000 https://gcc.gnu.org/g:065d191893234c1b2e4554fd78ba339d9b7d03e9 commit r13-1143-g065d191893234c1b2e4554fd78ba339d9b7d03e9 Author: David Malcolm Date: Thu Jun 16 17:27:08 2022 -0400 analyzer: associate -Wanalyzer-double-fclose with CWE-1341 gcc/analyzer/ChangeLog: * sm-file.cc (double_fclose::emit): Associate the warning with CWE-1341 ("Multiple Releases of Same Resource or Handle"). gcc/testsuite/ChangeLog: * gcc.dg/analyzer/file-1.c (test_1): Verify that double-fclose is associated with CWE-1341. Signed-off-by: David Malcolm Diff: --- gcc/analyzer/sm-file.cc | 9 ++++++--- gcc/testsuite/gcc.dg/analyzer/file-1.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc index 8514af19766..f6cb29c7806 100644 --- a/gcc/analyzer/sm-file.cc +++ b/gcc/analyzer/sm-file.cc @@ -178,9 +178,12 @@ public: bool emit (rich_location *rich_loc) final override { - return warning_at (rich_loc, get_controlling_option (), - "double % of FILE %qE", - m_arg); + diagnostic_metadata m; + /* CWE-1341: Multiple Releases of Same Resource or Handle. */ + m.add_cwe (1341); + return warning_meta (rich_loc, m, get_controlling_option (), + "double % of FILE %qE", + m_arg); } label_text describe_state_change (const evdesc::state_change &change) diff --git a/gcc/testsuite/gcc.dg/analyzer/file-1.c b/gcc/testsuite/gcc.dg/analyzer/file-1.c index e8d934331fd..316cbb3d868 100644 --- a/gcc/testsuite/gcc.dg/analyzer/file-1.c +++ b/gcc/testsuite/gcc.dg/analyzer/file-1.c @@ -14,7 +14,7 @@ test_1 (const char *path) fclose (f); /* { dg-message "\\(4\\) \\.\\.\\.to here" "to here" } */ /* { dg-message "\\(5\\) first 'fclose' here" "first fclose" { target *-*-* } .-1 } */ - fclose (f); /* { dg-warning "double 'fclose' of FILE 'f'" "warning" } */ + fclose (f); /* { dg-warning "double 'fclose' of FILE 'f' \\\[CWE-1341\\\]" "warning" } */ /* { dg-message "second 'fclose' here; first 'fclose' was at \\(5\\)" "second fclose" { target *-*-* } .-1 } */ }