From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 803A73858D38; Thu, 22 Sep 2022 18:27:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 803A73858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663871232; bh=GgABFBHb/GnMydjjaxw1j+BrdKCuloicmpGbh0/xMgs=; h=From:To:Subject:Date:From; b=IfDoYBm1FEhNmWJhg+vZ5DkaFUbDCp1ZEEXIUs7LrtHUsKqZg2YTgbT/ilr8fr9V8 1OD0SJlkL/JIe7nNaRO43ro9hgfJZ8hZQZE4gbE1YwjQof+vUfujPeSTqVAULZ6Yqx 9KHBX00SDn6jkKCYDP9d+sru317iT8rtmq1YiJv4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10268] Fortran: catch NULL pointer dereferences while simplifying PACK [PR106857] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 4a0921211ef30b5839f25d2ea83d329e2f31a542 X-Git-Newrev: f954e0531beb8cbb128cc4ab70d65a92c5ac9a7d Message-Id: <20220922182712.803A73858D38@sourceware.org> Date: Thu, 22 Sep 2022 18:27:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f954e0531beb8cbb128cc4ab70d65a92c5ac9a7d commit r11-10268-gf954e0531beb8cbb128cc4ab70d65a92c5ac9a7d Author: Harald Anlauf Date: Thu Sep 15 22:39:24 2022 +0200 Fortran: catch NULL pointer dereferences while simplifying PACK [PR106857] gcc/fortran/ChangeLog: PR fortran/106857 * simplify.c (gfc_simplify_pack): Check for NULL pointer dereferences while walking through constructors (error recovery). gcc/testsuite/ChangeLog: PR fortran/106857 * gfortran.dg/pr106857.f90: New test. (cherry picked from commit 2b75d5f533b9d6b39f4055949aff64ed0d22dd24) Diff: --- gcc/fortran/simplify.c | 2 +- gcc/testsuite/gfortran.dg/pr106857.f90 | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 85ea1311c7e..e02c2e1cf3f 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -6382,7 +6382,7 @@ gfc_simplify_pack (gfc_expr *array, gfc_expr *mask, gfc_expr *vector) /* Copy only those elements of ARRAY to RESULT whose MASK equals .TRUE.. */ mask_ctor = gfc_constructor_first (mask->value.constructor); - while (mask_ctor) + while (mask_ctor && array_ctor) { if (mask_ctor->expr->value.logical) { diff --git a/gcc/testsuite/gfortran.dg/pr106857.f90 b/gcc/testsuite/gfortran.dg/pr106857.f90 new file mode 100644 index 00000000000..4b0f86a75a6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr106857.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR fortran/106857 - ICE in gfc_simplify_pack +! Contributed by G.Steinmetz + +program p + type t + integer :: n + end type + type(t), parameter :: a(2,2) = t(1) + type(t), parameter :: b(4) = reshape(a, [2]) ! { dg-error "Different shape" } + type(t), parameter :: c(2) = pack(b, [.false.,.true.,.false.,.true.]) ! { dg-error "Different shape" } +end