From patchwork Tue Jan 5 20:41:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1422732 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: 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=LlFh7ykE; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (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 4D9PYM37C5z9sRR for ; Wed, 6 Jan 2021 07:41:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 488B7393C87E; Tue, 5 Jan 2021 20:41:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 488B7393C87E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1609879294; bh=F9RKajDicUPDKgziNsmw87qv9DJp3owif1ec7j24W4s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=LlFh7ykEdg2R/cIut2nsYRfBYfgNHKK+5jw/HpKgJ120gK8pEEq68YHc2l3QI9HDW KjlphFbigRF3sGaFKXkmxuivViYEReqhijZZFf5tGjG4eCxQ7sWkSwOQt+r9TTr0xB AbCufW/VYEiP58ZczQcViUwirPYaQ9nFjjTGEWnU= 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 119B3393C878; Tue, 5 Jan 2021 20:41:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 119B3393C878 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.80.130] ([93.207.80.130]) by web-mail.gmx.net (3c-app-gmx-bap22.server.lan [172.19.172.92]) (via HTTP); Tue, 5 Jan 2021 21:41:29 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/78746 - invalid access after error recovery Date: Tue, 5 Jan 2021 21:41:29 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:+aygWbjN/J7qCX30XFtbh3EyyYlrgUGO6gzz3EWwGcPt8XVUlr/vZk2KLjZM5jipJBWdn qqU0PD0HqzkMuAz+8aHbO20s55htP+kPIXouEz3YSzQMJeG3qWwoCXik8laAeqN9hft5Gc3cug6V btUVfdMeiQoowQbRNySVXUozxhu+b+qnB+Dp/osj1mTodDtTVTXFS30N/mNH/atqYTkPOnjjTRk8 GXc5zBAUmZ54uFTYORTMdhkgLOePB08//CbGxP7VrnzCYNmbwVHxKIKcnkVe0l+djMSyXDlz3dhh xQ= X-UI-Out-Filterresults: notjunk:1;V03:K0:kDKdvWwOkz0=:ojnuagLtnHYx8JxgS+CbQv ImB8pcQJeSNgeOX2LdqIO1skhWRBz9sAoKXS9MkFVNFf3ku1pFjYF8AR+a64HyVQ6/UooFcYN +IKsyG4lMhFqLnR3GJ9uWf/YqnXSPhiy96FtdAaTcafUVNMARs28zIWVeNlQKl2wg0kWEpL5+ mPT2dOwr7IMaMoYcqNTCcvD4/CX8XTLnY9TBdo0q64/3vqQtmNSk0sHk1eSExG6EX4hhyBlhz CVooMEzCABzP75keuUr0Gw0lxED8JAhHp/SmBfgkQX5zTPB1jM3KK22/WODCGXK3ZOGK2u0rg WW0uipjpHGmyZHfdUHom4ruanE4HhXR+z3yP6xpm7gaWZPvZIshYGDbDT2k8HYW0WRWj5sanO pinclsbJPk0kGvjgoiLbbo8mO0DfaRQxjmKF8mqVaGvTrzGOsRZydnkGCH+QmJeKrMG622wFY sehU9CPxuKsv0ROqY6lTap2VPM767OkmZ09R9lvSR89nu1lPpZIt8cNcXZoLwCn7KON7jOEE4 37mRY0Db/0/sPOax2SR6T//cTsobWysLwvOalLWa4iSeOGBqVs0qCHtDz0wE/ldfZHOs5HWUP v6YF29pK50Lm0= X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, 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: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Dear all, the PR contains a lengthy discussion of several testcases, some which were considered invalid and thus removed from the testsuite (charlen_03.f90, charlen_10.f90), charlen_15.f90 was resolved elsewhere, so that only class_61.f90 was left with an invalid access after error recovery with an instrumented compiler. I could reproduce the issue triggered by class_61.f90 using valgrind, and found that the attached trivial, almost obvious patch solves it. It even regtests cleanly on x86_64-pc-linux-gnu. OK for master? Open branches where testcase class_61.f90 exists? Thanks, Harald PR fortran/78746 - invalid access after error recovery The error recovery after an invalid reference to an undefined CLASS during a TYPE declaration lead to an invalid access. Add a check. gcc/fortran/ChangeLog: * resolve.c (resolve_component): Add check for valid CLASS reference before trying to access CLASS data. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index fa6f756d285..891db391907 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -14384,7 +14396,7 @@ resolve_component (gfc_component *c, gfc_symbol *sym) /* F2008, C448. */ if (c->ts.type == BT_CLASS) { - if (CLASS_DATA (c)) + if (c->attr.class_ok && CLASS_DATA (c)) { attr = &(CLASS_DATA (c)->attr);