aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorvehre <vehre@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-16 10:29:59 +0000
committervehre <vehre@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-16 10:29:59 +0000
commit1891b4bfdf4be1819dfef349f66943f56884b060 (patch)
tree0f32e47ce192b9f995b5547452e884643a7d6e16 /gcc/fortran
parent7081e92847c184c2f53c3121b212770cadd50a3b (diff)
gcc/fortran/ChangeLog:
2015-03-16 Andre Vehreschild <vehre@gmx.de> * resolve.c: Prevent segfault on illegal input. gcc/testsuite/ChangeLog: 2015-03-16 Andre Vehreschild <vehre@gmx.de> * gfortran.dg/pointer_2.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221455 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/resolve.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 30107c977af..a7071968dd3 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-16 Andre Vehreschild <vehre@gmx.de>
+
+ * resolve.c: Prevent segfault on illegal input.
+
2015-03-14 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/61138
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 942a9ad9ac4..465cf2ba8cf 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -2639,6 +2639,10 @@ found:
expr->ts = sym->ts;
expr->value.function.name = sym->name;
expr->value.function.esym = sym;
+ /* Prevent crash when sym->ts.u.derived->components is not set due to previous
+ error(s). */
+ if (sym->ts.type == BT_CLASS && !CLASS_DATA (sym))
+ return MATCH_ERROR;
if (sym->ts.type == BT_CLASS && CLASS_DATA (sym)->as)
expr->rank = CLASS_DATA (sym)->as->rank;
else if (sym->as != NULL)