diff mbox series

[Committed] PR fortran/91727 -- NULL pointer dereference

Message ID 20190915175126.GA31193@troutmask.apl.washington.edu
State New
Headers show
Series [Committed] PR fortran/91727 -- NULL pointer dereference | expand

Commit Message

Steve Kargl Sept. 15, 2019, 5:51 p.m. UTC 
Committed as obvious.

The patch checks for a NULL pointer dereference.  In this
case, it pointers to an error in the Fortran code, and so
gfortran now issues an informative error message.

2019-09-15  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91727
	* resolve.c (conformable_arrays):  If array-spec is NULL, then
	allocate-object is a scalar.  a conformability check only occurs
	for an array source-expr.

2019-09-15  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91727
	* gfortran.dg/pr91727.f90: New test.
diff mbox series

Patch

Index: gcc/fortran/resolve.c
===================================================================
--- gcc/fortran/resolve.c	(revision 275715)
+++ gcc/fortran/resolve.c	(working copy)
@@ -7487,7 +7487,7 @@  conformable_arrays (gfc_expr *e1, gfc_expr *e2)
   for (tail = e2->ref; tail && tail->next; tail = tail->next);
 
   /* First compare rank.  */
-  if ((tail && e1->rank != tail->u.ar.as->rank)
+  if ((tail && (!tail->u.ar.as || e1->rank != tail->u.ar.as->rank))
       || (!tail && e1->rank != e2->rank))
     {
       gfc_error ("Source-expr at %L must be scalar or have the "
Index: gcc/testsuite/gfortran.dg/pr91727.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr91727.f90	(nonexistent)
+++ gcc/testsuite/gfortran.dg/pr91727.f90	(working copy)
@@ -0,0 +1,9 @@ 
+! { dg-do compile }
+! Code contributed by Gerhard Steinmetz.
+program p
+   type t
+      class(*), allocatable :: a
+   end type
+   type(t) :: x
+   allocate (x%a, source=[1]) ! { dg-error "have the same rank as" }
+end