From patchwork Wed Feb 15 21:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1743125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Zrp3FIxX; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PHB5V5R8xz240K for ; Thu, 16 Feb 2023 08:28:29 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DD6F3385B507 for ; Wed, 15 Feb 2023 21:28:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD6F3385B507 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676496505; bh=hUp6Crx5A8Q2oZme6qn/e6DjOA6RCJmx+pkPLhsLnZM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Zrp3FIxXO4/TiaxzSwja56CdqVsNdgF/BSsg9USlzaF6kzsOklBDDNKFbnRCRon1f HVCsTII01b1X+YNXHZJjRFYd4VuKvTO4SF4YejNfw7mRt7MXVZ7n3Jn9GNHaIRpv+z u6wmbwtTKqL0zwjRlOtgSfx7iyHpbLkLIp4a9uFI= 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.15.15]) by sourceware.org (Postfix) with ESMTPS id 63F403858D28; Wed, 15 Feb 2023 21:28:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 63F403858D28 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.15.143] ([79.251.15.143]) by web-mail.gmx.net (3c-app-gmx-bs56.server.lan [172.19.170.140]) (via HTTP); Wed, 15 Feb 2023 22:28:00 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery on invalid assumed size reference [PR104554] Date: Wed, 15 Feb 2023 22:28:00 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:urenqoZmrbAPc9reec307L/dGEZWmv6hNyLG8p4wJAxN3JRbX/YxB29PCQHtIl4JFxKLy eX0PqNT4vbZ4gakGaClmjdXeSfmWZNOvGLmIMbK39HZt4zAXSxKMMQ4b5pZjgBtwCPVdOiQPWev6 2/nY3W70QvaWgFycsaJsfsLf4TJ4mKOW1uF2xPUN7NWB3vyGR6LxOMSbpZBdlwy85dn7+DkYY6Ah 0LoCtQQxVuYG9JKXFgt4g2648OFWr/iBuwPLAhmjFXuKTzJShTNkHg87Ha7C61nEUs4EXzgyCOOc 5w= UI-OutboundReport: notjunk:1;M01:P0:OaV/OFIyBcM=;9KpDaaRI37yFcAw8Ut0AaV9CndX yUkOi6b/RRDStDVTOIqv4Y+2kZbU/FEsbVbfWW9J+pAFv/Z7qQwuH+kGLTsL1q6qjrhrXZsE9 8zC7RSmSAPMOnW7AOjw8C5Zl5Cmqyo6tbWCnXje/GlNW7T5EjDTBQS0BjmrichlBdHIjBNQoj y/T3VAGml6fCohQYNPi6HdBZwXhrTjbIE9oXxognBmPK6A4/T1InjGVXWr/I5xHbxWiYL2n/f 8jjHNjZUnY6hkgAqJV3R3TvxJodTTWHzM/K0BLcoz1xDzcGTh+uZRccPPTh8ip8YpF4NhMybt V6UQVoLoDdl4PtKCWYj8D7xPg09I81VifzYLv79g64PgE/XRyoPLYNRPFrqK+gIzZDyyzUZA2 0fHhWlYRCElDTiCQJ8UNiTJhKz4YQHZ60DrAs3wjKqQCDhXukogpNuVLSBE5EHGsvfdUiEMnN 7xQyH42gIaRu+zAy4teO/4IKXeFiUfmzALSxtOqlJMks975PQD95RitVXk368mU+POUTjhJCU M9djdVvr/E/q6cj8w2q/6EB0qiFwc2hXYFFtX+xm8itdjlIMzJHiEGXu+vJ/ycYDk33v5HP42 B3XQkRHyTYNT69p778chUI377GIIdWC019zutnQec9pXANFXw+hC+FAPEyVlgpl6OPyVzllzV l8qVtf7WF8VAE1bQeVpGIflAM198IZBa7L9upZzn4UF6JIg+zaF/KsIt+jj3uTZdsVAkaFHtk PG03zMF1+ifaUczguuPOEMpsZSQWpOkZiVMaTqR0c427PoFBupe6AdaBrYvNZ9gyC7sf6bXpB 8OWwmBLWmpIETwfHdpttx7juLRAGwwSJVSNnOx9a/wQAA= X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, I've committed the attached obvious and trivial patch for a NULL pointer dereference on behalf of Steve and after regtesting on x86_64-pc-linux-gnu as r13-6066-ga418129273725fd02e881e6fb5e0877287a1356c Thanks, Harald From a418129273725fd02e881e6fb5e0877287a1356c Mon Sep 17 00:00:00 2001 From: Steve Kargl Date: Wed, 15 Feb 2023 22:20:22 +0100 Subject: [PATCH] Fortran: error recovery on invalid assumed size reference [PR104554] gcc/fortran/ChangeLog: PR fortran/104554 * resolve.cc (check_assumed_size_reference): Avoid NULL pointer dereference. gcc/testsuite/ChangeLog: PR fortran/104554 * gfortran.dg/pr104554.f90: New test. --- gcc/fortran/resolve.cc | 8 +++++--- gcc/testsuite/gfortran.dg/pr104554.f90 | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr104554.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 96c34065691..fb0745927ac 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1670,9 +1670,11 @@ check_assumed_size_reference (gfc_symbol *sym, gfc_expr *e) /* FIXME: The comparison "e->ref->u.ar.type == AR_FULL" is wrong. What should it be? */ - if (e->ref && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] == NULL) - && (e->ref->u.ar.as->type == AS_ASSUMED_SIZE) - && (e->ref->u.ar.type == AR_FULL)) + if (e->ref + && e->ref->u.ar.as + && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] == NULL) + && (e->ref->u.ar.as->type == AS_ASSUMED_SIZE) + && (e->ref->u.ar.type == AR_FULL)) { gfc_error ("The upper bound in the last dimension must " "appear in the reference to the assumed size " diff --git a/gcc/testsuite/gfortran.dg/pr104554.f90 b/gcc/testsuite/gfortran.dg/pr104554.f90 new file mode 100644 index 00000000000..099f219c85d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104554.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/104554 - ICE in check_assumed_size_reference +! Contributed by G.Steinmetz + +program p + type t + integer :: a + end type + class(t) :: x(*) ! { dg-error "Assumed size array" } + x%a = 3 +end -- 2.35.3