summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2015-05-18 22:52:52 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2015-05-18 22:52:52 +0000
commit73641c881f4bfb156aca31fe78976a7236722e38 (patch)
tree84fb2ac714ec3172071f3d12d759e925114a0574 /gcc/fortran
parentbfeeb14516c9ef05958f47a1bad907c1e6d73f5b (diff)
downloadgcc-73641c881f4bfb156aca31fe78976a7236722e38.tar.gz
re PR fortran/66052 (Segmentation fault for misplaced protected statement)
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/66052 * decl.c(gfc_match_protected): Prevent dereference of NULL pointer. 2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/66052 * gfortran.dg/protected_9.f90: New test. From-SVN: r223324
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/decl.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a8598a2004a..f54de3c335b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -5,6 +5,11 @@
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+ PR fortran/66043
+ * gfortran.dg/storage_size_6.f90: New tests.
+
+2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
+
PR fortran/66044
* decl.c(gfc_match_entry): Change a gfc_internal_error() into
a gfc_error()
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index f8d471aa3de..93a4554343f 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -6968,7 +6968,8 @@ gfc_match_protected (void)
gfc_symbol *sym;
match m;
- if (gfc_current_ns->proc_name->attr.flavor != FL_MODULE)
+ if (!gfc_current_ns->proc_name
+ || gfc_current_ns->proc_name->attr.flavor != FL_MODULE)
{
gfc_error ("PROTECTED at %C only allowed in specification "
"part of a module");