From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1676496480; i=anlauf@gmx.de; bh=JV0xHUAztNfP8P3hHxP+OqGo0HF+KkML7a3POz/LKTc=; h=X-UI-Sender-Class:From:To:Subject:Date; b=AGKCeYQkQrgsC9WlFEi+cgZ2oyfghO0Uya6EsGxJ8Yc+T/hLN0wkBOFXZRjjeHxa/ UF6Gt72mjLkRqU3aQUs6jRiA3M3lB6aCIwQ4+OdZJfbKifMD3rOoL8MSysK6oRLzjs tWuG42jXk0dbPoy2yp9szbdcC3RSCU8gTas34w2NIdJR+vKTnQyIRQb1hYsb/7Lp9e 4A3VMAe6to2jZhmimaQ4DMO/zeYg23mi5AiGKsdBdp2BT9t15p3VZfYo9JwpvyeDT1 uXmE6u4vVf0AJk9TgzodG/pNDI0v0xXeFmqUWm2Z5YVAgaXX6RosAP7LQ0PyZPxPBM qyV+FwBJMmqLQ== 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: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery on invalid assumed size reference [PR104554] Content-Type: multipart/mixed; boundary=rehcsed-3a3324b4-4674-4bbe-b05f-cb6cef1ad0df 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 List-Id: --rehcsed-3a3324b4-4674-4bbe-b05f-cb6cef1ad0df Content-Type: text/plain; charset=UTF-8 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 --rehcsed-3a3324b4-4674-4bbe-b05f-cb6cef1ad0df Content-Type: text/x-patch Content-Disposition: attachment; filename=pr104554.diff Content-Transfer-Encoding: quoted-printable =46rom 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. =2D-- 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 =2D-- 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 =3D=3D AR_FULL" is wrong. What should it be? */ - if (e->ref && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] =3D=3D NULL) - && (e->ref->u.ar.as->type =3D=3D AS_ASSUMED_SIZE) - && (e->ref->u.ar.type =3D=3D AR_FULL)) + if (e->ref + && e->ref->u.ar.as + && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] =3D=3D NULL) + && (e->ref->u.ar.as->type =3D=3D AS_ASSUMED_SIZE) + && (e->ref->u.ar.type =3D=3D 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/gfortr= an.dg/pr104554.f90 new file mode 100644 index 00000000000..099f219c85d =2D-- /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 =3D 3 +end =2D- 2.35.3 --rehcsed-3a3324b4-4674-4bbe-b05f-cb6cef1ad0df--