diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 22:52:52 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 22:52:52 +0000 |
| commit | 73641c881f4bfb156aca31fe78976a7236722e38 (patch) | |
| tree | 84fb2ac714ec3172071f3d12d759e925114a0574 /gcc | |
| parent | bfeeb14516c9ef05958f47a1bad907c1e6d73f5b (diff) | |
| download | gcc-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')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/protected_9.f90 | 15 |
4 files changed, 27 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"); 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 <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/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 +! <gerhard dot steinmetz dot fortran at t-online dot de> +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 |