summaryrefslogtreecommitdiff
path: root/gcc/fortran/interface.c
diff options
context:
space:
mode:
authorjanus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>2016-11-30 09:50:04 +0000
committerjanus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>2016-11-30 09:50:04 +0000
commit0836a6dd286ed58e730a51eaddc2cf2d5e6b8998 (patch)
tree3545cb58049e24356083d213deac96d297001759 /gcc/fortran/interface.c
parent9dc70d59ab283cedbd1e3e6bb9cf8bff718eba91 (diff)
downloadgcc-0836a6dd286ed58e730a51eaddc2cf2d5e6b8998.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@243005 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/interface.c')
-rw-r--r--gcc/fortran/interface.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index f5d3f7762ca..8afba84a697 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;