From 54c0257bc66b1f73dce5821253956a9cb4f6804a Mon Sep 17 00:00:00 2001 From: kargl Date: Mon, 18 May 2015 22:52:52 +0000 Subject: [PATCH] 2015-05-18 Steven G. Kargl PR fortran/66052 * decl.c(gfc_match_protected): Prevent dereference of NULL pointer. 2015-05-18 Steven G. Kargl PR fortran/66052 * gfortran.dg/protected_9.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223324 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/decl.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/protected_9.f90 | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/protected_9.f90 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 + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl + 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"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1ae1f08f49c..fa8dc0a2086 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl + PR fortran/66045 * gfortran.dg/null1.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/protected_9.f90 b/gcc/testsuite/gfortran.dg/protected_9.f90 new file mode 100644 index 00000000000..2786419f53a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/protected_9.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! PR fortran/66052 +! +! +! Original code from Gerhard Steinmetz +! +module a + contains + protected x ! { dg-error "only allowed in specification part" } +end module a + +program p + contains + protected x ! { dg-error "only allowed in specification part" } +end -- 2.11.4.GIT