gcc/analyzer/ChangeLog: PR analyzer/110882 * region.cc (int_size_in_bits): Fail on zero-sized types.
gcc/testsuite/ChangeLog: PR analyzer/110882 * gcc.dg/analyzer/pr110882.c: New test. (cherry picked from commit r14-2955-gc62f93d1e0383d) Signed-off-by: David Malcolm <dmalc...@redhat.com> --- gcc/analyzer/region.cc | 6 +++++- gcc/testsuite/gcc.dg/analyzer/pr110882.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/pr110882.c diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc index f982ce67509..c1bfecabd15 100644 --- a/gcc/analyzer/region.cc +++ b/gcc/analyzer/region.cc @@ -395,7 +395,11 @@ int_size_in_bits (const_tree type, bit_size_t *out) } tree sz = TYPE_SIZE (type); - if (sz && tree_fits_uhwi_p (sz)) + if (sz + && tree_fits_uhwi_p (sz) + /* If the size is zero, then we may have a zero-sized + array; handle such cases by returning false. */ + && !integer_zerop (sz)) { *out = TREE_INT_CST_LOW (sz); return true; diff --git a/gcc/testsuite/gcc.dg/analyzer/pr110882.c b/gcc/testsuite/gcc.dg/analyzer/pr110882.c new file mode 100644 index 00000000000..80027184053 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/pr110882.c @@ -0,0 +1,18 @@ +/* { dg-additional-options "-Wno-analyzer-too-complex" } */ + +struct csv_row { + char *columns[0]; +}; + +void +parse_csv_line (int n_columns, const char *columns[]) +{ + for (int n = 0; n < n_columns; n++) { + columns[n] = ((void *)0); + } +} + +void parse_csv_data (int n_columns, struct csv_row *entry) +{ + parse_csv_line(n_columns, (const char **)entry->columns); +} -- 2.26.3