aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/simplify.cc
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2022-12-01 21:16:46 +0100
committerHarald Anlauf <anlauf@gmx.de>2022-12-04 20:59:03 +0100
commit24b9337d1f1b5197b6498dceb9074319be003449 (patch)
treeb272a62c90b032a32d92fee89b68948b052606d7 /gcc/fortran/simplify.cc
parent98d6e4b6f1011655da19344bc124a3013b9c0134 (diff)
downloadgcc-24b9337d1f1b5197b6498dceb9074319be003449.zip
gcc-24b9337d1f1b5197b6498dceb9074319be003449.tar.gz
gcc-24b9337d1f1b5197b6498dceb9074319be003449.tar.bz2
Fortran: error recovery simplifying UNPACK for insufficient FIELD [PR107922]
gcc/fortran/ChangeLog: PR fortran/107922 * simplify.cc (gfc_simplify_unpack): Terminate simplification when array-valued argument FIELD does not provide enough elements. gcc/testsuite/ChangeLog: PR fortran/107922 * gfortran.dg/unpack_field_1.f90: New test.
Diffstat (limited to 'gcc/fortran/simplify.cc')
-rw-r--r--gcc/fortran/simplify.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc
index b618418..aff9a1b 100644
--- a/gcc/fortran/simplify.cc
+++ b/gcc/fortran/simplify.cc
@@ -8485,7 +8485,16 @@ gfc_simplify_unpack (gfc_expr *vector, gfc_expr *mask, gfc_expr *field)
}
}
else if (field->expr_type == EXPR_ARRAY)
- e = gfc_copy_expr (field_ctor->expr);
+ {
+ if (field_ctor)
+ e = gfc_copy_expr (field_ctor->expr);
+ else
+ {
+ /* Not enough elements in array FIELD. */
+ gfc_free_expr (result);
+ return &gfc_bad_expr;
+ }
+ }
else
e = gfc_copy_expr (field);