Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Pushed to trunk as r13-1143-g065d191893234c.
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 <dmalc...@redhat.com>
---
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 %<fclose%> 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 %<fclose%> 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 } */
}
--
2.26.3
