From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH] PR fortan/85779 -- Fix NULL pointer dereference
Date: Thu, 24 May 2018 00:25:00 -0000 [thread overview]
Message-ID: <20180524002415.GA30090@troutmask.apl.washington.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
Subject says it all. OK to commit?
2018-05-23 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85779
*decl.c (gfc_match_derived_decl): Fix NULL point dereference.
2018-05-23 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85779
* gfortran.dg/pr85779_1.f90: New test.
* gfortran.dg/pr85779_2.f90: Ditto.
* gfortran.dg/pr85779_3.f90: Ditto.
--
Steve
[-- Attachment #2: pr85779.diff --]
[-- Type: text/x-diff, Size: 2226 bytes --]
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (revision 260623)
+++ gcc/fortran/decl.c (working copy)
@@ -9960,8 +9960,12 @@ gfc_match_derived_decl (void)
if (!gensym->attr.generic && gensym->ts.type != BT_UNKNOWN)
{
- gfc_error ("Derived type name %qs at %C already has a basic type "
- "of %s", gensym->name, gfc_typename (&gensym->ts));
+ if (gensym->ts.u.derived)
+ gfc_error ("Derived type name %qs at %C already has a basic type "
+ "of %s", gensym->name, gfc_typename (&gensym->ts));
+ else
+ gfc_error ("Derived type name %qs at %C already has a basic type",
+ gensym->name);
return MATCH_ERROR;
}
Index: gcc/testsuite/gfortran.dg/pr85779_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr85779_1.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr85779_1.f90 (working copy)
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR fortran/85779
+type(t) function f() ! { dg-error "is not accessible" }
+ type f ! { dg-error "already has a basic type" }
+ end type ! { dg-error "END FUNCTION statement" }
+end
Index: gcc/testsuite/gfortran.dg/pr85779_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr85779_2.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr85779_2.f90 (working copy)
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/85779
+type(t) function f() result(z) ! { dg-error "is not accessible" }
+ type z ! { dg-error "already has a basic type" }
+ end type ! { dg-error "END FUNCTION statement" }
+end
+
Index: gcc/testsuite/gfortran.dg/pr85779_3.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr85779_3.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr85779_3.f90 (working copy)
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/85779
+class(t) function f() ! { dg-error "must be dummy, allocatable or pointer" }
+ type f ! { dg-error "already has a basic type" }
+ end type ! { dg-error "END FUNCTION statement" }
+end
+
next reply other threads:[~2018-05-24 0:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 0:25 Steve Kargl [this message]
2018-05-24 20:25 ` Janus Weil
2018-05-30 9:25 ` Thomas König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524002415.GA30090@troutmask.apl.washington.edu \
--to=sgk@troutmask.apl.washington.edu \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).