diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-24 16:40:00 -0400 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2022-10-24 16:40:48 -0400 |
| commit | 2e8a0553918adc919f98ac5c0224fc6ce1fef68d (patch) | |
| tree | 14ccc8ffe33c3b890a8b1b31d16d25184096dc8d /gcc | |
| parent | 18faaeb3af42f3d7dc609b9b91df77d0d59b16f6 (diff) | |
| download | gcc-2e8a0553918adc919f98ac5c0224fc6ce1fef68d.zip gcc-2e8a0553918adc919f98ac5c0224fc6ce1fef68d.tar.gz gcc-2e8a0553918adc919f98ac5c0224fc6ce1fef68d.tar.bz2 | |
diagnostics: fix ICE in sarif output with NULL filename [PR107366]
gcc/ChangeLog:
PR analyzer/107366
* diagnostic-format-sarif.cc
(sarif_builder::maybe_make_physical_location_object): Gracefully
reject locations with NULL filename.
gcc/testsuite/ChangeLog:
PR analyzer/107366
* gcc.dg/analyzer/sarif-pr107366.c: New test.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/diagnostic-format-sarif.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc index fc28d16..7110db4 100644 --- a/gcc/diagnostic-format-sarif.cc +++ b/gcc/diagnostic-format-sarif.cc @@ -595,7 +595,7 @@ sarif_builder::make_location_object (const diagnostic_event &event) json::object * sarif_builder::maybe_make_physical_location_object (location_t loc) { - if (loc <= BUILTINS_LOCATION) + if (loc <= BUILTINS_LOCATION || LOCATION_FILE (loc) == NULL) return NULL; json::object *phys_loc_obj = new json::object (); diff --git a/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c b/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c new file mode 100644 index 0000000..997cf56 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/sarif-pr107366.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fdiagnostics-format=sarif-file" } */ + +typedef enum { + HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO +} hwloc_topology_diff_obj_attr_type_t; +enum { HWLOC_TOPOLOGY_DIFF_OBJ_ATTR } hwloc_apply_diff_one_diff_0_0; + +void +hwloc_apply_diff_one() { + switch (hwloc_apply_diff_one_diff_0_0) + case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR: { + hwloc_topology_diff_obj_attr_type_t obj_attr_2_0_0; + switch (obj_attr_2_0_0) + case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO: { + unsigned ii = 0; + } + } +} + |