re PR fortran/82841 (Segfault in gfc_simplify_transfer)

2017-11-08  Steven G. Kargl  <kargl@kgcc.gnu.org>

	PR Fortran/82841
	* simplify.c(gfc_simplify_transfer): Do not dereference a NULL pointer.
	Unwrap a short line.

2017-11-08  Steven G. Kargl  <kargl@kgcc.gnu.org>

	PR Fortran/82841
	* gfortran.dg/transfer_simplify_11.f90: new test.

From-SVN: r254555

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b554f9f7937576db5c2f7acc5885d93c36332710..6c9f246d64ea2bddfb1249e1e9072edf41727d32 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-08  Steven G. Kargl  <kargl@kgcc.gnu.org>
+
+       PR Fortran/82841
+       * simplify.c(gfc_simplify_transfer): Do not dereference a NULL pointer.
+       Unwrap a short line.
+
 2017-11-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/82884

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index ba010a0aebff58b8d136c567f78c9749c578d1c0..c7b7e1a8297c2e26df995c84f3cc098aad8cc5fe 100644 (file)
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -6576,8 +6576,7 @@ gfc_simplify_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size)
     return NULL;
 
   /* Calculate the size of the source.  */
-  if (source->expr_type == EXPR_ARRAY
-      && !gfc_array_size (source, &tmp))
+  if (source->expr_type == EXPR_ARRAY && !gfc_array_size (source, &tmp))
     gfc_internal_error ("Failure getting length of a constant array.");
 
   /* Create an empty new expression with the appropriate characteristics.  */
@@ -6585,7 +6584,7 @@ gfc_simplify_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size)
                                  &source->where);
   result->ts = mold->ts;
 
-  mold_element = mold->expr_type == EXPR_ARRAY
+  mold_element = (mold->expr_type == EXPR_ARRAY && mold->value.constructor)
                 ? gfc_constructor_first (mold->value.constructor)->expr
                 : mold;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 475cc27b3c82726eb9c5d18b04060943b5480bcb..75c8a0ab752bfbedc4712bb97117de749ba80d34 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-08  Steven G. Kargl  <kargl@kgcc.gnu.org>
+
+       PR Fortran/82841
+       * gfortran.dg/transfer_simplify_11.f90: New test.
+
 2017-11-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/82884

diff --git a/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90 b/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90
new file mode 100644 (file)
index 0000000..ce7a4ad
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90
@@ -0,0 +1,8 @@
+! { dg-do run }
+! PR Fortran/82841
+!
+   integer, parameter :: N = 2
+   character(len=1) :: chr(N)
+   chr = transfer(repeat("x",ncopies=N),[character(len=1) ::], N)
+   if (chr(1) /= 'x' .and. chr(2) /= 'x') call abort
+end