diff options
author | Harald Anlauf <anlauf@gmx.de> | 2022-05-10 23:41:57 +0200 |
---|---|---|
committer | Harald Anlauf <anlauf@gmx.de> | 2022-05-11 19:13:17 +0200 |
commit | 0acdbe29f66017fc5cca40dcbd72a0dd41491d07 (patch) | |
tree | a1ff18cf5fd4c0839625b53c64674c7fb78c7da6 | |
parent | 5b2a24ebfc0b2b4c7dd3a58da951fa346abf2a11 (diff) | |
download | gcc-0acdbe29f66017fc5cca40dcbd72a0dd41491d07.zip gcc-0acdbe29f66017fc5cca40dcbd72a0dd41491d07.tar.gz gcc-0acdbe29f66017fc5cca40dcbd72a0dd41491d07.tar.bz2 |
Fortran: fix error recovery on invalid array section
gcc/fortran/ChangeLog:
PR fortran/105230
* expr.cc (find_array_section): Correct logic to avoid NULL
pointer dereference on invalid array section.
gcc/testsuite/ChangeLog:
PR fortran/105230
* gfortran.dg/pr105230.f90: New test.
Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>
-rw-r--r-- | gcc/fortran/expr.cc | 4 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/pr105230.f90 | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index 86d61fe..be94c18 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1595,8 +1595,8 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) if ((begin && begin->expr_type != EXPR_CONSTANT) || (finish && finish->expr_type != EXPR_CONSTANT) || (step && step->expr_type != EXPR_CONSTANT) - || (!begin && !lower) - || (!finish && !upper)) + || !lower + || !upper) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr105230.f90 b/gcc/testsuite/gfortran.dg/pr105230.f90 new file mode 100644 index 0000000..6c6b42e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105230.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/105230 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1, 2] ! { dg-error "deferred shape" } + print *, reshape([3, 4], a(1:2)) +end |