diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2022-09-15 22:39:24 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2022-09-15 22:39:24 +0200 |
| commit | 2b75d5f533b9d6b39f4055949aff64ed0d22dd24 (patch) | |
| tree | 82e6f1a72e424a3a248ce94e61e5cd6befa2edcf | |
| parent | 7bd4deb2a7c1394550610ab27507d1ed2af817c2 (diff) | |
| download | gcc-2b75d5f533b9d6b39f4055949aff64ed0d22dd24.zip gcc-2b75d5f533b9d6b39f4055949aff64ed0d22dd24.tar.gz gcc-2b75d5f533b9d6b39f4055949aff64ed0d22dd24.tar.bz2 | |
Fortran: catch NULL pointer dereferences while simplifying PACK [PR106857]
gcc/fortran/ChangeLog:
PR fortran/106857
* simplify.cc (gfc_simplify_pack): Check for NULL pointer dereferences
while walking through constructors (error recovery).
gcc/testsuite/ChangeLog:
PR fortran/106857
* gfortran.dg/pr106857.f90: New test.
| -rw-r--r-- | gcc/fortran/simplify.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr106857.f90 | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index bc178d5..140c177 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -6431,7 +6431,7 @@ gfc_simplify_pack (gfc_expr *array, gfc_expr *mask, gfc_expr *vector) /* Copy only those elements of ARRAY to RESULT whose MASK equals .TRUE.. */ mask_ctor = gfc_constructor_first (mask->value.constructor); - while (mask_ctor) + while (mask_ctor && array_ctor) { if (mask_ctor->expr->value.logical) { diff --git a/gcc/testsuite/gfortran.dg/pr106857.f90 b/gcc/testsuite/gfortran.dg/pr106857.f90 new file mode 100644 index 0000000..4b0f86a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr106857.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR fortran/106857 - ICE in gfc_simplify_pack +! Contributed by G.Steinmetz + +program p + type t + integer :: n + end type + type(t), parameter :: a(2,2) = t(1) + type(t), parameter :: b(4) = reshape(a, [2]) ! { dg-error "Different shape" } + type(t), parameter :: c(2) = pack(b, [.false.,.true.,.false.,.true.]) ! { dg-error "Different shape" } +end |