From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Fri, 30 Sep 2016 17:54:15 +0000 (+0000)
Subject: backport: re PR fortran/68566 (ICE on using unusable array in reshape (double free... 
X-Git-Tag: releases/gcc-5.5.0~803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2058a9532f6fedef6d669aa4d397cd9f91cb8234;p=thirdparty%2Fgcc.git

backport: re PR fortran/68566 (ICE on using unusable array in reshape (double free or corruption))

2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>

	Backport from trunk

	PR fortran/68566
	* check.c (gfc_check_reshape): Check for constant expression.

	PR fortran/68566
	* gfortran.dg/pr68566.f90: new test.

From-SVN: r240671
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3f0d9267831f..1cfa9e4acc34 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	Backport from trunk
+ 
+	PR fortran/68566
+	* check.c (gfc_check_reshape): Check for constant expression.
+
 2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	Backport from trunk
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 049a6fb18dd1..de7ed0fd0e36 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -3820,7 +3820,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
       if (!type_check (order, 3, BT_INTEGER))
 	return false;
 
-      if (order->expr_type == EXPR_ARRAY)
+      if (order->expr_type == EXPR_ARRAY && gfc_is_constant_expr (order))
 	{
 	  int i, order_size, dim, perm[GFC_MAX_DIMENSIONS];
 	  gfc_expr *e;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a77db1176edd..8f541d5c8615 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	Backport from trunk
+
+	PR fortran/68566
+	* gfortran.dg/pr68566.f90: new test.
+
 2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	Backport from trunk
diff --git a/gcc/testsuite/gfortran.dg/pr68566.f90 b/gcc/testsuite/gfortran.dg/pr68566.f90
new file mode 100644
index 000000000000..160e9ac58f6c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr68566.f90
@@ -0,0 +1,13 @@
+! { dg-do run }
+program p
+   character(len=20) s1, s2
+   integer, allocatable :: n(:)
+   n = [2,1]
+   s1 = '1 5 2 6 3 0 4 0'
+   write(s2,'(8(I0,1x))') reshape ([1,2,3,4,5,6], [2,4], [0,0], [2,1])
+   if (trim(s1) /= trim(s2)) call abort
+   write(s2,'(8(I0,1x))') reshape ([1,2,3,4,5,6], [2,4], [0,0], n)
+   if (trim(s1) /= trim(s2)) call abort
+   write(s2,'(8(I0,1x))') reshape ([1,2,3,4,5,6], [2,4], [0,0], [n])
+   if (trim(s1) /= trim(s2)) call abort
+end