diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2016-11-30 10:50:04 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2016-11-30 10:50:04 +0100 |
| commit | 40109581065366e04c547d2bff6e8f7ff5646fb8 (patch) | |
| tree | 3545cb58049e24356083d213deac96d297001759 /gcc | |
| parent | 0bdad1238b5b49ef3302321000d8eebf103e9038 (diff) | |
| download | gcc-40109581065366e04c547d2bff6e8f7ff5646fb8.zip gcc-40109581065366e04c547d2bff6e8f7ff5646fb8.tar.gz gcc-40109581065366e04c547d2bff6e8f7ff5646fb8.tar.bz2 | |
re PR fortran/78592 (ICE in gfc_find_specific_dtio_proc, at fortran/interface.c:4939)
2016-11-30 Janus Weil <janus@gcc.gnu.org>
PR fortran/78592
* interface.c (gfc_find_specific_dtio_proc): Rearrange code to avoid
dereferencing a null pointer.
2016-11-30 Janus Weil <janus@gcc.gnu.org>
PR fortran/78592
* gfortran.dg/dtio_18.f90: New test case.
From-SVN: r243005
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dtio_18.f90 | 15 |
4 files changed, 33 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 840eb8f..3b4799a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-11-30 Janus Weil <janus@gcc.gnu.org> + PR fortran/78592 + * interface.c (gfc_find_specific_dtio_proc): Rearrange code to avoid + dereferencing a null pointer. + +2016-11-30 Janus Weil <janus@gcc.gnu.org> + PR fortran/78573 * decl.c (build_struct): On error, return directly and do not build class symbol. diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index f5d3f77..8afba84 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -4933,15 +4933,15 @@ gfc_find_specific_dtio_proc (gfc_symbol *derived, bool write, bool formatted) && tb_io_st->n.sym && tb_io_st->n.sym->generic) { - gfc_interface *intr; - for (intr = tb_io_st->n.sym->generic; intr; intr = intr->next) + for (gfc_interface *intr = tb_io_st->n.sym->generic; + intr && intr->sym && intr->sym->formal; + intr = intr->next) { gfc_symbol *fsym = intr->sym->formal->sym; - if (intr->sym && intr->sym->formal - && ((fsym->ts.type == BT_CLASS - && CLASS_DATA (fsym)->ts.u.derived == extended) - || (fsym->ts.type == BT_DERIVED - && fsym->ts.u.derived == extended))) + if ((fsym->ts.type == BT_CLASS + && CLASS_DATA (fsym)->ts.u.derived == extended) + || (fsym->ts.type == BT_DERIVED + && fsym->ts.u.derived == extended)) { dtio_sub = intr->sym; break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3074e6d..3ed27c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-11-30 Janus Weil <janus@gcc.gnu.org> + + PR fortran/78592 + * gfortran.dg/dtio_18.f90: New test case. + 2016-11-30 Martin Liska <mliska@suse.cz> PR sanitizer/78541 diff --git a/gcc/testsuite/gfortran.dg/dtio_18.f90 b/gcc/testsuite/gfortran.dg/dtio_18.f90 new file mode 100644 index 0000000..cc85ba5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dtio_18.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! +! PR 78592: [7 Regression] ICE in gfc_find_specific_dtio_proc, at fortran/interface.c:4939 +! +! Contributed by Gerhard Steinmetz <gerhard.steinmetz.fortran@t-online.de> + +program p + type t + end type + type(t) :: z + interface write(formatted) + module procedure wf ! { dg-error "is neither function nor subroutine" } + end interface + print *, z +end |