diff options
| author | Marek Polacek <polacek@redhat.com> | 2017-02-20 15:50:23 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2017-02-20 15:50:23 +0000 |
| commit | 85ade8d6402c58174db08a3dbd7cb7ac538cbeae (patch) | |
| tree | 39de556007f2d485dbf59674934e6b5701642a79 | |
| parent | 80480ceee903c0f55d23995b7ae0a58fee2e7f43 (diff) | |
| download | gcc-85ade8d6402c58174db08a3dbd7cb7ac538cbeae.zip gcc-85ade8d6402c58174db08a3dbd7cb7ac538cbeae.tar.gz gcc-85ade8d6402c58174db08a3dbd7cb7ac538cbeae.tar.bz2 | |
re PR sanitizer/79558 (ICE: Segfault in ubsan_type_descriptor, at ubsan.c:412)
PR sanitizer/79558
* ubsan.c (ubsan_type_descriptor): Check if TYPE_MAX_VALUE is null.
* c-c++-common/ubsan/bounds-14.c: New test.
From-SVN: r245605
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/ubsan/bounds-14.c | 13 | ||||
| -rw-r--r-- | gcc/ubsan.c | 4 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ab2e544..02b5157 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -3,6 +3,9 @@ PR middle-end/79537 * gimplify.c (gimplify_expr): Handle unused *&&L;. + PR sanitizer/79558 + * ubsan.c (ubsan_type_descriptor): Check if TYPE_MAX_VALUE is null. + 2017-02-20 Jakub Jelinek <jakub@redhat.com> PR target/79568 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bbe7ac9..645d2ed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,6 +3,9 @@ PR middle-end/79537 * gcc.dg/comp-goto-4.c: New test. + PR sanitizer/79558 + * c-c++-common/ubsan/bounds-14.c: New test. + 2017-02-20 Jakub Jelinek <jakub@redhat.com> PR target/79568 diff --git a/gcc/testsuite/c-c++-common/ubsan/bounds-14.c b/gcc/testsuite/c-c++-common/ubsan/bounds-14.c new file mode 100644 index 0000000..ddb5251 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/bounds-14.c @@ -0,0 +1,13 @@ +/* PR sanitizer/79558 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=bounds" } */ + +void +fn1 (int n) +{ + int i, j; + int x[2][0]; + for (i = 0; i < n; i++) + for (j = 0; j < n; j++) + x[i][j] = 5; +} diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 0291401..11a41e1 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -409,7 +409,9 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) { pp_left_bracket (&pretty_name); tree dom = TYPE_DOMAIN (t); - if (dom && TREE_CODE (TYPE_MAX_VALUE (dom)) == INTEGER_CST) + if (dom != NULL_TREE + && TYPE_MAX_VALUE (dom) != NULL_TREE + && TREE_CODE (TYPE_MAX_VALUE (dom)) == INTEGER_CST) { if (tree_fits_uhwi_p (TYPE_MAX_VALUE (dom)) && tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1 != 0) |