public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH] fortran/65429 -- don't dereference a null pointer
Date: Fri, 27 Mar 2015 22:47:00 -0000	[thread overview]
Message-ID: <20150327224743.GA4459@troutmask.apl.washington.edu> (raw)

The following patch avoids the dereferencing of
a null pointer, which led to an ICE.  The patch
here is a slight variation on the patch submitted
by drikosev at otenet dot gr.  The testcase is a
slight variation on the code submitted by FX.

Built and regression tested on x86_64-*-freebsd.

OK to commit?

2015-03-27  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/65429
	* decl.c (add_init_expr_to_sym): Do not dereference a null pointer.

2015-03-27  Steven G. Kargl  <kargl@gcc.gnu.org>

    PR fortran/65429
	* pr65429.f90: New test.

-- 
Steve

Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c	(revision 220943)
+++ gcc/fortran/decl.c	(working copy)
@@ -1406,7 +1406,7 @@ add_init_expr_to_sym (const char *name, 
 		    {
 		      gfc_constructor *c;
 		      c = gfc_constructor_first (init->value.constructor);
-		      clen = c->expr->value.character.length;
+		      clen = c ? c->expr->value.character.length : 0;
 		      sym->ts.u.cl->length
 				= gfc_get_int_expr (gfc_default_integer_kind,
 						    NULL, clen);
Index: gcc/testsuite/gfortran.dg/pr65429.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr65429.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/pr65429.f90	(working copy)
@@ -0,0 +1,8 @@
+! { dg-do run }
+! PR fortran/65429
+program foo
+character(*), parameter :: s(*)  = [ character(5) :: 'abcde', 'fghij' ]
+if (s(1) /= 'abcde') call abort
+if (s(2) /= 'fghij') call abort
+end program foo
+

             reply	other threads:[~2015-03-27 22:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-27 22:47 Steve Kargl [this message]
2015-03-27 23:50 ` Tobias Burnus
2015-03-28  0:02 Dominique Dhumieres
2015-03-28  0:33 ` Steve Kargl
2015-03-28 11:42   ` Dominique d'Humières
2015-03-28 14:50     ` Steve Kargl
2015-03-28 15:17       ` Dominique d'Humières
2015-03-29 16:25 ` Steve Kargl
2015-03-31 17:17   ` Jerry DeLisle
2015-04-07 19:59     ` Steve Kargl
2015-04-22 23:18       ` Steve Kargl

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=20150327224743.GA4459@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).