From patchwork Wed Mar 9 21:04:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 51828 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 37B003858005 for ; Wed, 9 Mar 2022 21:05:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 37B003858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1646859907; bh=vX6vNHwTysSs3BbWF3HazrFFGGyG0YSwX7Qo86uh6wA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=f+CLdNc2D0k5OCZth3+Bi0HDIoBnG5JnFaznk8QGQY93PAn/B5cpYR7RDOEkrmoh8 1DjHCH1I0OKgRuRVzm75xA92fAaBK3QVfObbGsvBRVGkXU/hUAyJYhzap2fD961W8W 7J10o5P3zTpeVqvHSsy0uc/yZYY4pJFqDjn0pRpo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by sourceware.org (Postfix) with ESMTPS id AFD413858C74; Wed, 9 Mar 2022 21:04:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFD413858C74 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.85.8] ([93.207.85.8]) by web-mail.gmx.net (3c-app-gmx-bs60.server.lan [172.19.170.144]) (via HTTP); Wed, 9 Mar 2022 22:04:18 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] PR fortran/104849 - ICE in find_array_section, at fortran/expr.cc:1616 Date: Wed, 9 Mar 2022 22:04:18 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:Rxwnimc9Eh1/4ALHfF/5+CpbpC2lAQ0GtjLqoKtn9yVjKKCtMblxY+u4amx3W4e2NIRqg WOK5K86BibMoXGFKCAgkarIPcQcF1tt0oVGqdNV1nBNU/vKalnAHKf7aZqMz+YD+f4HVG80PWMIF w5msxmwTOunHj02AFAKhqY2Bmi04jN5995pmEt3sH8xg8aqQYjskFX+N4JmSJwGg9Zfx9nQgTM+o iOwd/0kWztMmMt+R5x1zoi2wNG5rinMP8VXB692lD/LWBtv7BYs4nE0KvlzOLA5FUHZ2odjv2vay y0= X-UI-Out-Filterresults: notjunk:1;V03:K0:hQoG7LvTWRo=:lk2cKawojR4hA7xl11ZHGy ynp9bye9QDb5+FAW5wmDQM4VTPbsxD8KJldX5aWdA+Nw5bBL/8ewsG0IbFIX8SUfMYaG5h39u +vvrVi9RnaK68FQLKKE6O7WFEPL5X+C+Rr2koVq/qIWatYgQlbV3xP2r1smkW5JqLtTBSECkg Jv0xTIdmQP8MXRlhMHqpTDMHkNfxGAg7zTdvlOxtP25qRpdVR/oRUtaOABp3nzu7qmMpnPv8I a4+DTDtjLv5ykIMuBOn46hgLovNJiKecOp9zOKhnNGwK/WwwBgomGM1LxUyQLrnKlvmpYFnMX dVPQAoIQXaCtbxZxoLJH9i2/B4F/vKYb3agJ+Xjdmy34z74YOYMuRl72ZfVAe79D0ua6DfVNm dVXUlRPcAHR/ZwoDsbUpsbbTFa3hlTLmSWYhX3e0QJBGkySsKLgtDZQwdGeN7Iiq00Yk2Prje 5qJhQliUpn95F/O7BoxAR4fPBT7KfJwzRF6lAQshHVepVjbW607D+Bc6Fp5fBMyNcHf6BO3Hp VVMnbN758JtkX1n9z+hDqYjXuBhp3gmCYdH/L8Q7MKyWrHjHhFAbtcl+uKlNN0F1JdoDk0YS5 p1e5L4vvhle3l2jBPG6MrgWK+se0bYBgd/08YRNEN1WrvlKZKwoX5XG42K9l4CsE30nti5WBD R19O5sdjK8kfK/tzZlzPXJE/sjXeLYX9PTJSMmTGnCmSF7bs0IOwPh/O/aZ+XVaDuLDVPG4sp rKmK79sjKVDdHOzbfrMKMi/+o7nyqOD7CfsWawqeO0sjgF2XhCAXyPmWv6gyffJtHAhbSUtNa LGs75RM X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, referencing an invalid array section could lead to a NULL pointer dereference. Testcase by Gerhard. Committed to mainline as obvious after regtesting as https://gcc.gnu.org/g:22015e77d3e45306077396b9de8a8a28bb67fb20 Thanks, Harald From 22015e77d3e45306077396b9de8a8a28bb67fb20 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 9 Mar 2022 21:58:26 +0100 Subject: [PATCH] Fortran: improve error recovery on invalid array section gcc/fortran/ChangeLog: PR fortran/104849 * expr.cc (find_array_section): Avoid NULL pointer dereference on invalid array section. gcc/testsuite/ChangeLog: PR fortran/104849 * gfortran.dg/pr104849.f90: New test. --- gcc/fortran/expr.cc | 4 +++- gcc/testsuite/gfortran.dg/pr104849.f90 | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr104849.f90 diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index c9c0ba4cc2e..86d61fed302 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1594,7 +1594,9 @@ 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)) + || (step && step->expr_type != EXPR_CONSTANT) + || (!begin && !lower) + || (!finish && !upper)) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr104849.f90 b/gcc/testsuite/gfortran.dg/pr104849.f90 new file mode 100644 index 00000000000..ae221b5ba10 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104849.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/104849 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1, 2] ! { dg-error "deferred shape" } + integer :: x(2) + data x /a(:)/ ! { dg-error "Invalid" } +end -- 2.34.1