From patchwork Sun Jun 28 14:29:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1318582 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=UVZ/BYds; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49vtLh16m1z9sDX for ; Mon, 29 Jun 2020 00:30:03 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9DED388E812; Sun, 28 Jun 2020 14:29:58 +0000 (GMT) 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.20]) by sourceware.org (Postfix) with ESMTPS id 2F71B3851C2C; Sun, 28 Jun 2020 14:29:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2F71B3851C2C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=anlauf@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1593354594; bh=RWd4x7tJhBW7RqtryAxV+KbD78giYSlaHmFIwcTwGnk=; h=X-UI-Sender-Class:From:To:Subject:Date; b=UVZ/BYdsEDS31xt7VI/8A6y0Rnw9mN9KAu/4rdWecxh4/aAMxh6i6RGZJ3ImU0b8o TJy9+e16iPgqr/weQApTvfGs/Xc+qTx+uKRXkAJmoLHMJktV6bDY7BpswzlHuS/77B boodqD7yL+ZXzqwqLJIwq9l2l3lG7ijyO7SqU6dM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.232.145.180] ([79.232.145.180]) by web-mail.gmx.net (3c-app-gmx-bap66.server.lan [172.19.172.66]) (via HTTP); Sun, 28 Jun 2020 16:29:54 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] PR fortran/95340 - [10/11 Regression] ICE in gfc_match_select_rank, at fortran/match.c:6690 Date: Sun, 28 Jun 2020 16:29:54 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:2BAI3S8Sw9ppY/B8ZLeGXzHi94txLLTsgeVkUa76miJ9udL8RwgI/3CXevnQcealfaBVH tTh+ETZap4FoW5uY7RxK14pMi6OpbjokcuFRtZT5O/gzk76JFWaTqa/5Upit53jc8x/k9ZB1KOIh oVtYaioPCqkKhDEqZVa4UQ3TtPTsxPeJ5JmA5QM8tYO9kdlS6mCs2y7O7bbf8JbI1kVIEAWRcqhK U5wSJZqBwDRJBkNnN/F3kKpNEzFXVAisyP8q+eAmbl1dmwYpAHSXevjSpxEHkGp95AfwOTIBaOvA QQ= X-UI-Out-Filterresults: notjunk:1;V03:K0:y0CViLYz8vQ=:tJ/RNGS5NUqteuost8Y4MD q3zmEDzclb394TGl9gbRDST+ENe4wOI3mBdbYyVjpvl8Xg4QiFHhDnfakL5S65+JC4VcG9ood V7gVGy5JOJwL0ZgCL8LADACD85C+s8k7ZMIMjcpYXxlJAej1hKLeJVOKTKr7V5tlBXkqOkATM XlSBp1Ic0gflobGBCWi2gHXWr6Xs5K2MtrcSiK0b2CkQ1C/gtluJzBwF3sfwwtvv+DPQUeDEc mbjPNzsUuZfG6ldOFZpaThJ53l840aw3sjjaGdpR0+mV8CbAc7LKtur0fnzkpQ2E892OFrj3O erhtr9flgJxFw69vb2r8M2liYcSd9eWNY8rQxcuKTIQc7NIxjk6NUpFL5hxIT+svMIqN0uPuK 5PrfMUPRxFbQXUIY5VNDL4ELno4O1ekClcxMF2jEhFqxcjNG4FhOP8PAyyutCQBW7f4cmf6Fq lBEa3iHROFefgLisHC222S/WutUCMnECi+mis9r4iWo9PcMxxxCeZX7Iw0tClcXyyS0omqW3j SND4pp5eiblbiUZr/mprRr11t5maEzOhP6zRigVlQ3zCpX788EMHQBd6Q3oaQbtlvgZo0wMKA iuWhsQL1ua2dVO58BYPJuk3DDJnRQhElDh4OJqEho0+O6pOxidZXCn3kyaUA9Qfvqwh3H7JK0 mtsB8V1tbg1mkVH38avvrQGXCmOe323xNnB4+/jVXMtNgeQ== X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Committed as obvious. NULL pointer dereference originally found by Steve. My patch is shorter. :-) Regtested on x86_64-pc-linux-gnu. Thanks, Harald PR fortran/95340 - ICE in gfc_match_select_rank, at fortran/match.c:6690 Do not dereference NULL pointer when querying array shape of possibly improperly delared variable. gcc/fortran/ PR fortran/95340 * match.c (gfc_match_select_rank): Do not dereference NULL pointer. diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index b011634792e..db5174f3f21 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -6695,7 +6695,8 @@ gfc_match_select_rank (void) if (expr1->symtree) { sym = expr1->symtree->n.sym; - as = sym->ts.type == BT_CLASS ? CLASS_DATA (sym)->as : sym->as; + as = (sym->ts.type == BT_CLASS + && CLASS_DATA (sym)) ? CLASS_DATA (sym)->as : sym->as; } if (expr1->expr_type != EXPR_VARIABLE diff --git a/gcc/testsuite/gfortran.dg/pr95340.f90 b/gcc/testsuite/gfortran.dg/pr95340.f90 new file mode 100644 index 00000000000..edcdc935057 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr95340.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! PR fortran/95340 - ICE in gfc_match_select_rank, at fortran/match.c:6690 + +program p + type t + end type t + class(t) :: z ! { dg-error "must be dummy, allocatable or pointer" } + select rank (z) ! { dg-error "must be an assumed rank variable" } + end select ! { dg-error "Expecting END PROGRAM" } +end