From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 486053858D33; Mon, 23 Jan 2023 21:51:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 486053858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674510672; bh=PPDbtGOYpNjQxlViWYUDNnnclSP5KdAaQxU0C3cTxyw=; h=From:To:Subject:Date:From; b=FA1bMduUKw3QmJh1rAO+XI6JEwqTWvCTWiCw/DlNK8r5BFuWgBxZdnNeN1Fdvhygp Oz7ge4kIrTx+tkWx1nmfXAQhSnrXO2NinHRBDOQ8dSh6P/TOGSoE4fv86rU5UelZJ4 HeqhwamZ6NU1lZP7JP9SS/MhIK8xKd9gybnDSUGw= 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 r13-5315] Fortran: fix NULL pointer dereference in gfc_check_dependency [PR108502] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: e3585e6acdfd5c1793f877476647d2521620c95c X-Git-Newrev: 51767f31878a95161142254dca7119b409699670 Message-Id: <20230123215112.486053858D33@sourceware.org> Date: Mon, 23 Jan 2023 21:51:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:51767f31878a95161142254dca7119b409699670 commit r13-5315-g51767f31878a95161142254dca7119b409699670 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.cc (gfc_check_dependency): Prevent NULL pointer dereference while recursively checking expressions. gcc/testsuite/ChangeLog: PR fortran/108502 * gfortran.dg/pr108502.f90: New test. Diff: --- gcc/fortran/dependency.cc | 5 +++++ gcc/testsuite/gfortran.dg/pr108502.f90 | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/fortran/dependency.cc b/gcc/fortran/dependency.cc index 43417a6ec76..9117825ee6e 100644 --- a/gcc/fortran/dependency.cc +++ b/gcc/fortran/dependency.cc @@ -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