From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by sourceware.org (Postfix) with ESMTPS id 715AC3858D32; Thu, 1 Dec 2022 20:25:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 715AC3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1669926330; bh=wWyWGW7oqdGn7mWZbjWudtQOlXqNlfT3RP3NZlrB3Qs=; h=X-UI-Sender-Class:From:To:Subject:Date; b=FoNaiBJxo9IsG9mMmxPCV4/PU6+BNCZeJ05SiYuuaUVnqXtzV1CBh+xBG3w46dMCD 2o+nQYoHLLe4QivrUPPpWHv4M3WiUBc50ZkqLXBbbfnGIHFgGVmkGhHPy3J6kz87Ik NaA1GsyZiCqiRW8KH3zVuPv7HS0Fqyhvda7Hs86djrXbRVEfrd6BFi2yjUJEbC9WGY f+xDJ2zX5FKIUZ9jhq4I2p8Cl3gpmjye7j4NNQyQKgsMkSESz5mAoIO2Y2DMts82qM d2neZJEGEp6iSbyxIuqN/xMA5Oo300ex7kcZgPx8VZPTxgQPcfDe8jadkF+gwYKJ/I 8PAh6TegFd55Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.88.222] ([93.207.88.222]) by web-mail.gmx.net (3c-app-gmx-bs60.server.lan [172.19.170.144]) (via HTTP); Thu, 1 Dec 2022 21:25:30 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: error recovery simplifying UNPACK for insufficient FIELD [PR107922] Content-Type: multipart/mixed; boundary=rekceb-42d31aa3-25bc-4ac4-8f2c-f58d1e7e96a5 Date: Thu, 1 Dec 2022 21:25:30 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:8rVrdIMU+85OfBHHeA/xyL8Q6B5XzgCcPJNkIHVbc3PvHHfD3vG5ekKFFlBwStXkeIGfo dJxdyIr+Qb6zxrPbi7XWJKjnkglWooxW3WFDR+im0OZrooiMBC24myNU9VFWNFKYNWrYxm00XAQR 7h8MlRxYMmQWx1J+xnMkg//lIDA0kWwOYFlauliDHdBZOe3bPRs68t64toTurVBBoQIhLtqQ/pnn Fyxhl7rgQZ/SurJBaIEfYNjFQLaa90lG0eXXGH+OJRCN/EAqu4pqsiTeXJA1EkXzEUk4mvHykTAZ Jg= UI-OutboundReport: notjunk:1;M01:P0:2xlAXnl1Oqw=;hKKyvDG5mGKjFUbzPtshqXHWID+ ZHE3k63uAuPJeokJGlsvoGnfZP+lvEufvcufWNlXyZ37Flmb0IqcbtMaHN0ReSzeAtJDTsr6J qtPhq9xKcAiBIU4aL3Gg6RPhMPjKIviRs0Y6ZT3JbU91/VhOBqaJJL0MOH9IDJVpFjNmcWv9w 3AsqPh0haR6xjJFgPn95a0b69gM62Gl7xA92MrsBesDBVIgpQY3bJW61ldo4xYa5jyH6OFd0W /bY/DDl/sclfpJ6FyWqCHTrZR6ozPn7TVyxl8n6x7whh5z+3HOI3fwKTDpCArJ6puc4kTnp4W Zgw8ZReRCNvcZz776nO8fQQe3Z/UdxicI1KdTKep4yNhsrEkON4gUUiNHb3Ra3WXtLI7yTgXD tA3jCrG044TiQlHnXjI/nBT7AV988eR3oYwLmqL5nVvGqRYfB+lNkYXoLRCG0T3452A8L+6Bz RxziqJJ/4LS7kbcRntQ+YmHpeFNwq/zLIV1JIP41G6N0tJ7hUKcowSF+XF1fzcrP5X7twW+op UUaXcVoACkxY+szRqEb+JdJCYyT85RjlkW3Zhgl4bllgLql5Z4kMeIBmOfpVUc/NW12IOkMu2 iULy42s2Qoap+VuiI9gkTz265zFVqwduzx4yzf2MAvDz21xcZNDQRDyY+ogwpXHohkF3UyPbr ZbQ1onwfQWndELkn7j0OjWmPHSZOeN/i4jcmc9FweIsPwkDzO1i1pwaSm49ytC/wJNB5PKovL huyQyCCPJWDHg6bgfN9DsVuL8djOZN9AMQp8HErHyGi/CESkJDeldIPJ0KIKZdkOQhbc2GFPg loFSH+tuJdeawF/yRs2W2fzg== X-Spam-Status: No, score=-13.4 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,RCVD_IN_MSPIKE_H2,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 List-Id: --rekceb-42d31aa3-25bc-4ac4-8f2c-f58d1e7e96a5 Content-Type: text/plain; charset=UTF-8 Dear all, we did not properly handle the case of insufficient array-valued FIELD when trying to simplify UNPACK and could run into a NULL pointer dereference. The fix is obvious. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald --rekceb-42d31aa3-25bc-4ac4-8f2c-f58d1e7e96a5 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr107922.diff Content-Transfer-Encoding: quoted-printable =46rom 0ff50e73c6fce52263b9530daffe6743c1fc9b2c Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 1 Dec 2022 21:16:46 +0100 Subject: [PATCH] Fortran: error recovery simplifying UNPACK for insufficie= nt FIELD [PR107922] gcc/fortran/ChangeLog: PR fortran/107922 * simplify.cc (gfc_simplify_unpack): Terminate simplification when array-valued argument FIELD does not provide enough elements. gcc/testsuite/ChangeLog: PR fortran/107922 * gfortran.dg/unpack_field_1.f90: New test. =2D-- gcc/fortran/simplify.cc | 9 ++++++++- gcc/testsuite/gfortran.dg/unpack_field_1.f90 | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/unpack_field_1.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index b6184181f26..0a0a7755f4c 100644 =2D-- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -8485,7 +8485,14 @@ gfc_simplify_unpack (gfc_expr *vector, gfc_expr *ma= sk, gfc_expr *field) } } else if (field->expr_type =3D=3D EXPR_ARRAY) - e =3D gfc_copy_expr (field_ctor->expr); + if (field_ctor) + e =3D gfc_copy_expr (field_ctor->expr); + else + { + /* Not enough elements in array FIELD. */ + gfc_free_expr (result); + return &gfc_bad_expr; + } else e =3D gfc_copy_expr (field); diff --git a/gcc/testsuite/gfortran.dg/unpack_field_1.f90 b/gcc/testsuite/= gfortran.dg/unpack_field_1.f90 new file mode 100644 index 00000000000..ca3cfbd2bd4 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/unpack_field_1.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! PR fortran/107922 - ICE in gfc_simplify_unpack +! Test error recovery when shapes of FIELD and MASK do not match +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(2) =3D 1 + integer, parameter :: d(3) =3D 1 + logical, parameter :: mask(3) =3D [.false.,.true.,.false.] + integer, parameter :: b(2) =3D unpack(a,mask,a) ! { dg-error "= must have identical shape" } + integer :: c(3) =3D unpack(a,[.false.,.true.,.false.],a) ! { dg-error "= must have identical shape" } + print *, unpack(a,mask,a) ! { dg-error "mu= st have identical shape" } + print *, unpack(a,mask,d) ! OK + print *, unpack(a,mask,3) ! OK +end =2D- 2.35.3 --rekceb-42d31aa3-25bc-4ac4-8f2c-f58d1e7e96a5--