From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 30C44385800A; Sat, 4 Feb 2023 15:43:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 30C44385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675525402; bh=iVkDiEBx8qzlF+id6YS2znQNIpzcRRUxf/k30jjUUgE=; h=From:To:Subject:Date:From; b=nQnu/9zmDRvi5CA7ChDm51y8WxHzkwSpfPNlxzSmuW60U1VmqSyxVZGxSyXzu8WhS AcyylinHPT/KfB3iBq/0nRtR73apiRY+uyGyqRLx+vIjGY/au0pbbC10cB1xam8pgN xdJY+TcmLsNp9sf12bC2OxaTx+ph6hsZg+cnMDAo= 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-10503] Fortran: fix NULL pointer dereference in gfc_check_dependency [PR108502] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 2235737a967c9eeabe7b02ffb014d8efef3276af X-Git-Newrev: d7ec0bdfeae883d852d7c0dfc67766a3793f5892 Message-Id: <20230204154322.30C44385800A@sourceware.org> Date: Sat, 4 Feb 2023 15:43:22 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d7ec0bdfeae883d852d7c0dfc67766a3793f5892 commit r11-10503-gd7ec0bdfeae883d852d7c0dfc67766a3793f5892 Author: Harald Anlauf Date: Mon Jan 23 22:13:44 2023 +0100 Fortran: fix NULL pointer dereference in gfc_check_dependency [PR108502] gcc/fortran/ChangeLog: PR fortran/108502 * dependency.c (gfc_check_dependency): Prevent NULL pointer dereference while recursively checking expressions. gcc/testsuite/ChangeLog: PR fortran/108502 * gfortran.dg/pr108502.f90: New test. (cherry picked from commit 51767f31878a95161142254dca7119b409699670) Diff: --- gcc/fortran/dependency.c | 5 +++++ gcc/testsuite/gfortran.dg/pr108502.f90 | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index e1336e1c654..7a3cc82a5b2 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -1292,6 +1292,11 @@ gfc_check_dependency (gfc_expr *expr1, gfc_expr *expr2, bool identical) if (expr1->expr_type != EXPR_VARIABLE) gfc_internal_error ("gfc_check_dependency: expecting an EXPR_VARIABLE"); + /* Prevent NULL pointer dereference while recursively analyzing invalid + expressions. */ + if (expr2 == NULL) + return 0; + switch (expr2->expr_type) { case EXPR_OP: diff --git a/gcc/testsuite/gfortran.dg/pr108502.f90 b/gcc/testsuite/gfortran.dg/pr108502.f90 new file mode 100644 index 00000000000..45f73849c57 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr108502.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! { dg-options "-O2 -ffrontend-optimize" } +! PR fortran/108502 - ICE in gfc_check_dependency +! Contributed by G.Steinmetz + +integer function n() + integer :: a(1) + a = [1] / 0 +end +program p + integer :: b = n() ! { dg-error "must be an intrinsic function" } +end