aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorAndre Vehreschild <vehre@gmx.de>2015-03-16 11:29:59 +0100
committerAndre Vehreschild <vehre@gcc.gnu.org>2015-03-16 11:29:59 +0100
commit6c25f7962556e2217d5070720ac879c40063209a (patch)
tree0f32e47ce192b9f995b5547452e884643a7d6e16 /gcc/fortran
parent9e25209f3a29dd1c8ee33c848a6a2b66e4c06d48 (diff)
downloadgcc-6c25f7962556e2217d5070720ac879c40063209a.zip
gcc-6c25f7962556e2217d5070720ac879c40063209a.tar.gz
gcc-6c25f7962556e2217d5070720ac879c40063209a.tar.bz2
resolve.c: Prevent segfault on illegal input.
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. From-SVN: r221455
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 30107c9..a707196 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 942a9ad..465cf2b 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)