From patchwork Tue Feb 1 20:42:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1587378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=H0DGhj1c; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JpH1q4ptlz9s5B for ; Wed, 2 Feb 2022 07:42:54 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9E0CC385B83F for ; Tue, 1 Feb 2022 20:42:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9E0CC385B83F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643748172; bh=OsYPzvO7+ishH6XK4SK0AmClEFL/zdNLNZoPp3jpGeE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=H0DGhj1cPElaCu96yFFKCwdUX97OKlNb+RqzrBaYIrDBRtUrOgeZ83uUC3lFmBpDE Oib5d+2t8gEooEb+/XJ2/5lhWKj4yHUUZ2jP+M2ZTKUY2NYkfMzgO8K+RoRC+3Z8BG v5b5pHA5fCZ87i8GMWR5owQkXGH7wlFeA7LtHQUA= 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.22]) by sourceware.org (Postfix) with ESMTPS id 372943858D35; Tue, 1 Feb 2022 20:42:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 372943858D35 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.5.102] ([79.251.5.102]) by web-mail.gmx.net (3c-app-gmx-bap65.server.lan [172.19.172.65]) (via HTTP); Tue, 1 Feb 2022 21:42:13 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [pushed] PR fortran/104331 - [10/11/12 Regression] ICE in gfc_simplify_eoshift, at fortran/simplify.cc:2590 Date: Tue, 1 Feb 2022 21:42:13 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:w8W2I4gotPd4auMBCf0Zlja1d+hMxtE8wZP0h0l3XPns/LoLE9/zsaHxKWRT8Wd/GMFgn r3u3ePGH2mkQzA0Ms78eOODqMgwqI7waOKwR9hhYw5W2bQ2+XTNEeztvQ8DomKoMzjFkaGYeAl1Y z0TvNSLeYQKTLCeg4fDypCY4503ZpVcD756Cg4MA+vPQ4kwSSYbaSBrwugK/11wvmW2/378oRUpY XG0JpvRX9n2/F/yzcFHVVl2W0NSO9uhWF2QRnRC3EJyOFOrMGvqNEsFoiN2Em+LEb6mw+K7WXDcg Z0= X-UI-Out-Filterresults: notjunk:1;V03:K0:Z1qZFfgT0RU=:ylVMQDBpaZ9mayrmWehzTG QZj2MJ4B4XO82AIF+LlsN8yz6agNgct3smDuZ3FfrQs97hOMPVJmLAV/5FjobsEXPkbIUtF8V BqaNZOqoEhf/m4cKbj4YVAEpl3Snh2kaOSzIBRQgbwq8F3epd0vNta0q/S7J+j7nIwZa0E9hj UVCF79UDMFWdDDpi2JSdLzTMGQuYYYQlNQBzZIvjMTzgqjlwiXitIUqzVe2KiYC0BGV8aV9YA UUxK6H99Y0x08eKhX00n09FhT+vIEE+cn7RhZyLiNkdMNSJ6jNgJBMGpaWSP0aBSRKNH8YA/0 PBollzeRa8tgTwH1+VNK76ZVH7eFdOfqTwYefrkG9SwGU1Y4F3v+6J0Yy0WNqf/mRnSnyFxf9 LbS4gF+Hikd7rf/EXpxDtsk7zKrmwLWbWnW7GZ2Owc6V1YlO1iA8etosX2jIp1zx3OWZiWPTC 1A7FlCexHThcPgNUfTm4U201zKIvlL2/RVHPas0vyi4RGmlb9ZlpmQ2sw3ON0eQBXZCfxbRaN aW1IcWCoKU02/xSF59rlsQfUk5DvkSi3YCBLGvzMAbmMCPvsr3CRhRKzkacbUzYcDYl/xggnW eZqOl1Fb9mKuFnbQspOv9oL2V2dTERFb5T4u/a/XXcMhUMArcYkGA5mUkhLq9FmB0/G+Cz+2p egSSmNq05NIbpQBSrGgCN2b4Mh0t93qpYs7bUJjN9HmbC5qjkbm4otiVRCqPbTr4n0hn+F0e3 Csok7A1v/B/gHSX2qXBUqkEOexX/rSBAMwf+g+8zSngpa9P/9xNYkmDjJrlmPcbJdthu04Y5p Sjaxd2K X-Spam-Status: No, score=-12.0 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, T_SCC_BODY_TEXT_LINE, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, another trivial and obvious one, discovered by Gerhard. We can have a NULL pointer dereference simplifying EOSHIFT on an array that was not properly declared. Pushed to mainline as r12-6977 after regtesting on x86_64-pc-linux-gnu. Will backport to affected branches [11/10] with some delay. Thanks, Harald From 447047a8f95c6bf4b1873f390c833e91aa8af18c Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 1 Feb 2022 21:36:42 +0100 Subject: [PATCH] Fortran: error recovery when simplifying EOSHIFT gcc/fortran/ChangeLog: PR fortran/104331 * simplify.cc (gfc_simplify_eoshift): Avoid NULL pointer dereference when shape is not set. gcc/testsuite/ChangeLog: PR fortran/104331 * gfortran.dg/eoshift_9.f90: New test. --- gcc/fortran/simplify.cc | 3 +++ gcc/testsuite/gfortran.dg/eoshift_9.f90 | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/eoshift_9.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index 8604162cfd5..6483f9c31e7 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -2572,6 +2572,9 @@ gfc_simplify_eoshift (gfc_expr *array, gfc_expr *shift, gfc_expr *boundary, if (arraysize == 0) goto final; + if (array->shape == NULL) + goto final; + arrayvec = XCNEWVEC (gfc_expr *, arraysize); array_ctor = gfc_constructor_first (array->value.constructor); for (i = 0; i < arraysize; i++) diff --git a/gcc/testsuite/gfortran.dg/eoshift_9.f90 b/gcc/testsuite/gfortran.dg/eoshift_9.f90 new file mode 100644 index 00000000000..f711b04a7da --- /dev/null +++ b/gcc/testsuite/gfortran.dg/eoshift_9.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/104331 - ICE in gfc_simplify_eoshift +! Contributed by G.Steinmetz + +program p + character(3), parameter :: a(:) = ['123'] ! { dg-error "deferred shape" } + character(3), parameter :: b(*) = eoshift(a, 1) +end -- 2.34.1