From patchwork Sat Dec 3 18:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 61409 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 262823858D20 for ; Sat, 3 Dec 2022 18:28:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 262823858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670092096; bh=7BurY4a0HAKmNMoja366/xemlua7Fo0fB4zcqWdv3Xw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tg/Cu6mDyuFq+islA4+6T3X/dR4cMh8uqiDBZN3gne4DrbSo5T4gOqA1Q8XNHxJzm MqNJxROt12mRyRmB148gRq3mq/kfQTvGMY0pbtQdYLxQHY2OQYvJAxoKi24v6c9Q9u yOPKQFIElYNyUoFgqgv+9lrab94vtIqYecEBjtOc= 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.19]) by sourceware.org (Postfix) with ESMTPS id 378D83858D20; Sat, 3 Dec 2022 18:27:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 378D83858D20 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.85.95] ([93.207.85.95]) by web-mail.gmx.net (3c-app-gmx-bs55.server.lan [172.19.170.139]) (via HTTP); Sat, 3 Dec 2022 19:27:46 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: error recovery handling invalid CLASS variable [PR107899] Date: Sat, 3 Dec 2022 19:27:46 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:GokTIJhLu0YYj1ht2WMaDuXkPuIIMTEpw/iuA5Zsc1yxNMUSWYnZmBq2mSRTmkwxOKQou cV9ASVRO6VaTgcDi+57/3NqvX+/t4Gzh8cS94exH6EvO8IfZpmmOkzwiA6LJvU7iCxMfo6PPnrsI gOGo7eTeINJ/XvkuJlmXEzn/uDEN313l2x0n/rmir0GQbfXLCwQ946QCpB7sqZjXMktzJOYJ7z8R N/KCdkkIRODV//XAWm5tTydr7ZGuyS/c6/HNaeB2lZySUKOTVvnKZzLkUtmUJ6Anblt1sfXe++rL Cc= UI-OutboundReport: notjunk:1;M01:P0:mPwOlv4BJZc=;qD2MQF19afi4Z0NjvdjAMw/ijgk N6hJzImjl8ZrUbWEltiuNy3Du4iSTGyYW+tTHU4nGlYp17UNbDmRMperJkEf0eNOjLRl4mg0X 4Wp9vbbQawxKPxayg0FepomORaivsjWo4PsSu2fzHeP53kLT6vvf1+3qdHf4OHQhAc2Us6APr BnuGHOgyKlDCqxre7jyFfhaQOPYxBIq/FnIiUPHDWLIGONGe8pNX8uy9U2xasSyiU7pYbSTwh rsWzQRWpI7GufAhcYmlRk/U89f39t9mnVeN4rmcvuE6svHBHrntOXXnmQ42huMrffqtU5xc9M xQYoNXyg1WveQBEp7rAGcm/XZyKEAMmCH7zM1m3ts4qRNcIt0AgHNWHmQv5gKciQiV358RBwW gug27oR+mhygNAfMRbm84lGTCqeAEGJILF10A6ZwBLoCtM9W77wSc2vdU0nWNmF1OLCxjTa0L FrrxrdjcdXhWKmf0UpV5t5C0soBjIO9iS55f3h30k4E0Wyfo100r09JX7SVEwhh81brDTr8w/ MZgM3uV+11hi/XgAIKq9Zq+1h0so1fOOWUxHJbRDg9nlJwrrH3okULa+U2qWCAILVCyoranrn ZwG47UmCxOe+p9nAuoXwTcL33wC2ZwR0Al5UayyFSigAWNfBOIa+i5e71o9fYi1GucmB0Iswr l25l/fqkdD11MUwWPiqdJJvxVjwvJkHuGZ6p6ARVB07+DpI+qUry605RJO5grmAyZO2gYg1ip fLFS4SP/YAfhVIxaJePfgt8+jXya73uyOnJrWlEYn9K1v+4UJ/a7EryFgJcyY6YF14uaVCL8F QTNVrHtHHIR5wBkjp0KW1CzQ== X-Spam-Status: No, score=-13.5 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, 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the attached obvious patch fixes a NULL pointer dereference that occurs with an invalid CLASS argument to DEALLOCATE. Regtested on x86_64-pc-linux-gnu. Will commit soon unless there are comments. Thanks, Harald From dfe7f1a06d78f6319ad81f5774dc43fe52e37f45 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sat, 3 Dec 2022 19:21:07 +0100 Subject: [PATCH] Fortran: error recovery handling invalid CLASS variable [PR107899] gcc/fortran/ChangeLog: PR fortran/107899 * resolve.cc (resolve_deallocate_expr): Avoid NULL pointer dereference on invalid CLASS variable. gcc/testsuite/ChangeLog: PR fortran/107899 * gfortran.dg/pr107899.f90: New test. --- gcc/fortran/resolve.cc | 2 +- gcc/testsuite/gfortran.dg/pr107899.f90 | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr107899.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 3396c6ce4a7..75dc4b59105 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -7570,7 +7570,7 @@ resolve_deallocate_expr (gfc_expr *e) sym = e->symtree->n.sym; unlimited = UNLIMITED_POLY(sym); - if (sym->ts.type == BT_CLASS) + if (sym->ts.type == BT_CLASS && sym->attr.class_ok && CLASS_DATA (sym)) { allocatable = CLASS_DATA (sym)->attr.allocatable; pointer = CLASS_DATA (sym)->attr.class_pointer; diff --git a/gcc/testsuite/gfortran.dg/pr107899.f90 b/gcc/testsuite/gfortran.dg/pr107899.f90 new file mode 100644 index 00000000000..e47b57b7b91 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107899.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! { dg-options "-fcoarray=single" } +! PR fortran/107899 - ICE in resolve_deallocate_expr +! Contributed by G.Steinmetz + +program p + type t + end type + class(t), target :: x[:] ! { dg-error "deferred shape" } + if (allocated (x)) then ! { dg-error "must be ALLOCATABLE" } + deallocate (x) ! { dg-error "must be ALLOCATABLE or a POINTER" } + end if +end -- 2.35.3