From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id A7F2B3890002; Fri, 18 Jun 2021 18:21:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7F2B3890002 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-8622] Fortran - ICE in gfc_check_do_variable, at fortran/parse.c:4446 X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: fe918041ce9809755a7e1b2f62071c2b27829610 X-Git-Newrev: 067e45a6f376582b1d3d36cc9b2124b60093b5c2 Message-Id: <20210618182129.A7F2B3890002@sourceware.org> Date: Fri, 18 Jun 2021 18:21:29 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 18:21:29 -0000 https://gcc.gnu.org/g:067e45a6f376582b1d3d36cc9b2124b60093b5c2 commit r11-8622-g067e45a6f376582b1d3d36cc9b2124b60093b5c2 Author: Harald Anlauf Date: Wed Jun 16 22:04:22 2021 +0200 Fortran - ICE in gfc_check_do_variable, at fortran/parse.c:4446 Avoid NULL pointer dereferences during error recovery. gcc/fortran/ChangeLog: PR fortran/95501 PR fortran/95502 * expr.c (gfc_check_pointer_assign): Avoid NULL pointer dereference. * match.c (gfc_match_pointer_assignment): Likewise. * parse.c (gfc_check_do_variable): Avoid comparison with NULL symtree. gcc/testsuite/ChangeLog: PR fortran/95501 PR fortran/95502 * gfortran.dg/pr95502.f90: New test. (cherry picked from commit cfe0a2ec26867b290eb84af00317e60f8b67455c) Diff: --- gcc/fortran/expr.c | 3 +++ gcc/fortran/match.c | 2 +- gcc/fortran/parse.c | 3 +++ gcc/testsuite/gfortran.dg/pr95502.f90 | 8 ++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 956003ec605..b11ae7ce5c5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3815,6 +3815,9 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue, int proc_pointer; bool same_rank; + if (!lvalue->symtree) + return false; + lhs_attr = gfc_expr_attr (lvalue); if (lvalue->ts.type == BT_UNKNOWN && !lhs_attr.proc_pointer) { diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 393755e4d93..b312a26a718 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -1409,7 +1409,7 @@ gfc_match_pointer_assignment (void) gfc_matching_procptr_assignment = 0; m = gfc_match (" %v =>", &lvalue); - if (m != MATCH_YES) + if (m != MATCH_YES || !lvalue->symtree) { m = MATCH_NO; goto cleanup; diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 1549f8e1635..610e729c68a 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -4485,6 +4485,9 @@ gfc_check_do_variable (gfc_symtree *st) { gfc_state_data *s; + if (!st) + return 0; + for (s=gfc_state_stack; s; s = s->previous) if (s->do_variable == st) { diff --git a/gcc/testsuite/gfortran.dg/pr95502.f90 b/gcc/testsuite/gfortran.dg/pr95502.f90 new file mode 100644 index 00000000000..d40fd9a5508 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr95502.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/95502 - ICE in gfc_check_do_variable, at fortran/parse.c:4446 + +program p + integer, pointer :: z + nullify (z%kind) ! { dg-error "in variable definition context" } + z%kind => NULL() ! { dg-error "constant expression" } +end