diff options
| author | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-05-06 10:54:12 +0000 |
|---|---|---|
| committer | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-05-06 10:54:12 +0000 |
| commit | 2d489e97541b46f23ef19de92a2723b12eb9356e (patch) | |
| tree | 36ce37cb53e9715ce35da90216583cea9eec7a46 | |
| parent | a68f5eaa87625184cde2fa2e76ccbfcafb1c64aa (diff) | |
PR sanitizer/70875
* ubsan.c (get_ubsan_type_info_for_type): Remove assert.
* gcc.dg/ubsan/bounds-3.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235959 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ubsan/bounds-3.c | 22 | ||||
| -rw-r--r-- | gcc/ubsan.c | 1 |
4 files changed, 38 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e0c4793a53f..5f8de4a12a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,14 @@ 2016-05-06 Marek Polacek <polacek@redhat.com> Backported from mainline + 2016-05-06 Marek Polacek <polacek@redhat.com> + + PR sanitizer/70875 + * ubsan.c (get_ubsan_type_info_for_type): Remove assert. + +2016-05-06 Marek Polacek <polacek@redhat.com> + + Backported from mainline 2016-04-29 Marek Polacek <polacek@redhat.com> Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7c9ba68ad59..500bccdb161 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,14 @@ 2016-05-06 Marek Polacek <polacek@redhat.com> Backported from mainline + 2016-05-06 Marek Polacek <polacek@redhat.com> + + PR sanitizer/70875 + * gcc.dg/ubsan/bounds-3.c: New test. + +2016-05-06 Marek Polacek <polacek@redhat.com> + + Backported from mainline 2016-04-29 Marek Polacek <polacek@redhat.com> PR sanitizer/70342 diff --git a/gcc/testsuite/gcc.dg/ubsan/bounds-3.c b/gcc/testsuite/gcc.dg/ubsan/bounds-3.c new file mode 100644 index 00000000000..50ad67389f8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/bounds-3.c @@ -0,0 +1,22 @@ +/* PR sanitizer/70875 */ +/* { dg-do run } */ +/* { dg-options "-fsanitize=bounds" } */ + +int +foo (int n, int k) +{ + struct S + { + int i[n]; + int value; + } s[2]; + return s[k].value = 0; +} + +int +main () +{ + return foo (2, 2); +} + +/* { dg-output "index 2 out of bounds for type 'S \\\[2\\\]'" } */ diff --git a/gcc/ubsan.c b/gcc/ubsan.c index d3fbfd177e6..0a768f86c96 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -302,7 +302,6 @@ ubsan_source_location (location_t loc) static unsigned short get_ubsan_type_info_for_type (tree type) { - gcc_assert (TYPE_SIZE (type) && tree_fits_uhwi_p (TYPE_SIZE (type))); if (TREE_CODE (type) == REAL_TYPE) return tree_to_uhwi (TYPE_SIZE (type)); else if (INTEGRAL_TYPE_P (type)) |