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

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

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

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

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

From-SVN: r238911

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 13f1a9089dbe41c1c069d4b3c3e4e53eef07fd0d..32a1e86ab253a3bd5a36a681fd4885761077ac3b 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/68566
+       * check.c (gfc_check_reshape): Check for constant expression.
+
 2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/69867

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 085ac40c870e0594dc8479a431252c6d409ba3d9..288957aaa34fba3f063ad9ff2021cf6e7ea73003 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -3827,7 +3827,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 a73a39defc69bb45642b07ee9d61f5233815d78c..e4ce4c7ecebd0b0da3b8574cd1426cdede2b28ee 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/68566
+       * gfortran.dg/pr68566.f90: new test.
+
 2016-07-30 Martin Sebor  <msebor@redhat.com>
 
        PR c++/60760

diff --git a/gcc/testsuite/gfortran.dg/pr68566.f90 b/gcc/testsuite/gfortran.dg/pr68566.f90
new file mode 100644 (file)
index 0000000..160e9ac
--- /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