From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 86F143858028; Fri, 26 Mar 2021 06:58:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 86F143858028 Received: by mail-lj1-x22c.google.com with SMTP id u9so6153398ljd.11; Thu, 25 Mar 2021 23:58:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=ELAHYFablOvxYDnOrWm1Ums2Ej50PbZVxcCddxy1zyc=; b=rmp7HsTvXMN+FrTmT4tjPZc/Vfh9G/fby15lXuHR53HFwrFhTKf8a1sDb46V4JdYxH JxJEPK6rxK09yy+LLtXNMIR1ebJl9Fg1SoLmbQQsLQAHcAdGnGjnLcp1PuI23Flk7W/w QjWJGMFIzhP7MNivhJ6kT9XrR5e0hv8WliFN+UcNOmh7Ou9uKUNkDI3kpU0SPI3CsC06 5O2UmBjaT920h6DNx1hCWaS7d/ERiftTHMOHdNigH4+mLJxmc87arPb+nWExKOporrE9 gijpRyJ62B5BL8LND/PXeFOGkm8Gv7hIyKeQDBtscjrHiMVqLBVF12m8l3BFSX/318/e liEA== X-Gm-Message-State: AOAM533xc0jn8yhS5t5vD/nz4fS/qjKWiqsly5awzaw4ZAgCAM4xWttD vplvxDiaXXuCVniUaMtZdAnSPVQTCKsu3TrjtmbiYmzMOtU= X-Google-Smtp-Source: ABdhPJx2kETjqk6uj3it57GS7zx42XC3/N5Bg9cnpCY2m1nydyyjsGAhs7nPz7I3kaUMd1dSz2SIV8YIMy6zjQwlMRM= X-Received: by 2002:a05:651c:149:: with SMTP id c9mr8017079ljd.101.1616741930977; Thu, 25 Mar 2021 23:58:50 -0700 (PDT) MIME-Version: 1.0 From: Paul Richard Thomas Date: Fri, 26 Mar 2021 06:58:38 +0000 Message-ID: Subject: [Patch, fortran] PR99602 - [11 regression] runtime error: pointer actual argument not associated To: "fortran@gcc.gnu.org" , gcc-patches Cc: =?UTF-8?Q?J=C3=BCrgen_Reuter?= Content-Type: multipart/mixed; boundary="0000000000007d66ba05be6b10ed" X-Spam-Status: No, score=-8.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FILL_THIS_FORM, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2021 06:58:54 -0000 --0000000000007d66ba05be6b10ed Content-Type: text/plain; charset="UTF-8" This patch is straightforward but the isolation of the problem was rather less so. Many thanks to Juergen for testcase reduction. Regtested on FC33/x86_64 - OK for master? Paul Fortran: Fix problem with runtime pointer chack [PR99602]. 2021-03-26 Paul Thomas gcc/fortran/ChangeLog PR fortran/99602 * trans-expr.c (gfc_conv_procedure_call): Use the _data attrs for class expressions and detect proc pointer evaluations by the non-null actual argument list. gcc/testsuite/ChangeLog PR fortran/99602 * gfortran.dg/pr99602.f90: New test. * gfortran.dg/pr99602a.f90: New test. * gfortran.dg/pr99602b.f90: New test. --0000000000007d66ba05be6b10ed Content-Type: text/x-fortran; charset="US-ASCII"; name="pr99602a.f90" Content-Disposition: attachment; filename="pr99602a.f90" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kmpydzj31 ISB7IGRnLWRvIGNvbXBpbGUgfQohIHsgZGctb3B0aW9ucyAiLWZjaGVjaz1wb2ludGVyIC1mZHVt cC10cmVlLW9yaWdpbmFsIiB9CiEKISBUZXN0IGZpeCBvZiBQUjk5NjAyLCB3aGVyZSBhIHNwdXJp b3VzIHJ1bnRpbWUgZXJyb3Igd2FzIGludHJvZHVjZWQKISBieSBQUjk5MTEyLiBUaGlzIGlzIHRo ZSB0ZXN0Y2FzZSBpbiBjb21tZW50ICM2IG9mIHRoZSBQUi4KISBUaGlzIHZlcnNpb24gb2YgUFI5 OTYwMi5mOTAgdHVybnMgb24gdGhlIHJ1bnRpbWUgZXJyb3JzIGJ5IGVsaW1pbmF0aW5nCiEgdGhl IHBvaW50ZXIgYXR0cmlidXRlIGZyb20gdGhlIGZvcm1hbCBhcmd1bWVudHMgaW4gdGhlIGFic3Ry YWN0IGludGVyZmFjZQohIGFuZCBwcmVwYXJlX3doaXphcmRfbTIuCiEKISBDb250cmlidXRlZCBi eSBKZXVyZ2VuIFJldXRlciAgPGp1ZXJnZW4ucmV1dGVyQGRlc3kuZGU+CiEKbW9kdWxlIG0KICBp bXBsaWNpdCBub25lCiAgcHJpdmF0ZQogIHB1YmxpYyA6OiBtX3QKICB0eXBlIDo6IG1fdAogICAg IHByaXZhdGUKICBlbmQgdHlwZSBtX3QKZW5kIG1vZHVsZSBtCgptb2R1bGUgbTJfdGVzdGJlZAog IHVzZSBtCiAgaW1wbGljaXQgbm9uZQogIHByaXZhdGUKICBwdWJsaWMgOjogcHJlcGFyZV9tMgog IHByb2NlZHVyZSAocHJlcGFyZV9tMl9wcm9jKSwgcG9pbnRlciA6OiBwcmVwYXJlX20yID0+IG51 bGwgKCkKCiAgYWJzdHJhY3QgaW50ZXJmYWNlCiAgICAgc3Vicm91dGluZSBwcmVwYXJlX20yX3By b2MgKG0yKQogICAgICAgaW1wb3J0CiAgICAgICBjbGFzcyhtX3QpLCBpbnRlbnQoaW5vdXQpIDo6 IG0yCiAgICAgZW5kIHN1YnJvdXRpbmUgcHJlcGFyZV9tMl9wcm9jCiAgZW5kIGludGVyZmFjZQoK ZW5kIG1vZHVsZSBtMl90ZXN0YmVkCgptb2R1bGUgYQogIHVzZSBtCiAgdXNlIG0yX3Rlc3RiZWQs IG9ubHk6IHByZXBhcmVfbTIKICBpbXBsaWNpdCBub25lCiAgcHJpdmF0ZQogIHB1YmxpYyA6OiBh XzEKCmNvbnRhaW5zCgogIHN1YnJvdXRpbmUgYV8xICgpCiAgICBjbGFzcyhtX3QpLCBwb2ludGVy IDo6IG1tCiAgICBtbSA9PiBudWxsICgpCiAgICBjYWxsIHByZXBhcmVfbTIgKG1tKSAhIFJ1bnRp bWUgZXJyb3IgdHJpZ2dlcmVkIGhlcmUKICBlbmQgc3Vicm91dGluZSBhXzEKCmVuZCBtb2R1bGUg YQoKCm1vZHVsZSBtMgogIHVzZSBtCiAgaW1wbGljaXQgbm9uZQogIHByaXZhdGUKICBwdWJsaWMg OjogbTJfdAoKICB0eXBlLCBleHRlbmRzIChtX3QpIDo6IG0yX3QKICAgICBwcml2YXRlCiAgIGNv bnRhaW5zCiAgICAgcHJvY2VkdXJlIDo6IHJlYWQgPT4gbTJfcmVhZAogIGVuZCB0eXBlIG0yX3QK Y29udGFpbnMKCiAgc3Vicm91dGluZSBtMl9yZWFkIChtbSkKICAgIGNsYXNzKG0yX3QpLCBpbnRl bnQob3V0KSwgdGFyZ2V0IDo6IG1tCiAgZW5kIHN1YnJvdXRpbmUgbTJfcmVhZAplbmQgbW9kdWxl IG0yCgpwcm9ncmFtIG1haW4KICB1c2UgbTJfdGVzdGJlZAogIHVzZSBhLCBvbmx5OiBhXzEKICBp bXBsaWNpdCBub25lCiAgcHJlcGFyZV9tMiA9PiBwcmVwYXJlX3doaXphcmRfbTIKICBjYWxsIGFf MSAoKQoKY29udGFpbnMKCiAgc3Vicm91dGluZSBwcmVwYXJlX3doaXphcmRfbTIgKG1tKQogICAg dXNlIG0KICAgIHVzZSBtMgogICAgY2xhc3MobV90KSwgaW50ZW50KGlub3V0KSA6OiBtbQogICAg c2VsZWN0IHR5cGUgKG1tKQogICAgdHlwZSBpcyAobTJfdCkKICAgICAgIGNhbGwgbW0lcmVhZCAo KQogICAgZW5kIHNlbGVjdAogIGVuZCBzdWJyb3V0aW5lIHByZXBhcmVfd2hpemFyZF9tMgplbmQg cHJvZ3JhbSBtYWluCiEgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICJfZ2ZvcnRy YW5fcnVudGltZV9lcnJvcl9hdCIgMSAib3JpZ2luYWwiIH0gfQohIHsgZGctZmluYWwgeyBzY2Fu LXRyZWUtZHVtcC10aW1lcyAiUG9pbnRlciBhY3R1YWwgYXJndW1lbnQiIDEgIm9yaWdpbmFsIiB9 IH0K --0000000000007d66ba05be6b10ed Content-Type: text/x-fortran; charset="US-ASCII"; name="pr99602.f90" Content-Disposition: attachment; filename="pr99602.f90" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kmpydzii0 ISB7IGRnLWRvIGNvbXBpbGUgfQohIHsgZGctb3B0aW9ucyAiLWZjaGVjaz1wb2ludGVyIC1mZHVt cC10cmVlLW9yaWdpbmFsIiB9CiEKISBUZXN0IGZpeCBvZiBQUjk5NjAyLCB3aGVyZSBhIHNwdXJp b3VzIHJ1bnRpbWUgZXJyb3Igd2FzIGludHJvZHVjZWQKISBieSBQUjk5MTEyLiBUaGlzIGlzIHRo ZSB0ZXN0Y2FzZSBpbiBjb21tZW50ICM2IG9mIHRoZSBQUi4KISBQUjk5NjAyYS5mOTAgdHVybnMg b24gdGhlIHJ1bnRpbWUgZXJyb3JzIGJ5IGVsaW1pbmF0aW5nIHRoZSBwb2ludGVyCiEgYXR0cmli dXRlIGZyb20gdGhlIGZvcm1hbCBhcmd1bWVudHMgaW4gdGhlIGFic3RyYWN0IGludGVyZmFjZSBh bmQKISBwcmVwYXJlX3doaXphcmRfbTIuCiEKISBDb250cmlidXRlZCBieSBKZXVyZ2VuIFJldXRl ciAgPGp1ZXJnZW4ucmV1dGVyQGRlc3kuZGU+CiEKbW9kdWxlIG0KICBpbXBsaWNpdCBub25lCiAg cHJpdmF0ZQogIHB1YmxpYyA6OiBtX3QKICB0eXBlIDo6IG1fdAogICAgIHByaXZhdGUKICBlbmQg dHlwZSBtX3QKZW5kIG1vZHVsZSBtCgptb2R1bGUgbTJfdGVzdGJlZAogIHVzZSBtCiAgaW1wbGlj aXQgbm9uZQogIHByaXZhdGUKICBwdWJsaWMgOjogcHJlcGFyZV9tMgogIHByb2NlZHVyZSAocHJl cGFyZV9tMl9wcm9jKSwgcG9pbnRlciA6OiBwcmVwYXJlX20yID0+IG51bGwgKCkKCiAgYWJzdHJh Y3QgaW50ZXJmYWNlCiAgICAgc3Vicm91dGluZSBwcmVwYXJlX20yX3Byb2MgKG0yKQogICAgICAg aW1wb3J0CiAgICAgICBjbGFzcyhtX3QpLCBpbnRlbnQoaW5vdXQpLCBwb2ludGVyIDo6IG0yCiAg ICAgZW5kIHN1YnJvdXRpbmUgcHJlcGFyZV9tMl9wcm9jCiAgZW5kIGludGVyZmFjZQoKZW5kIG1v ZHVsZSBtMl90ZXN0YmVkCgptb2R1bGUgYQogIHVzZSBtCiAgdXNlIG0yX3Rlc3RiZWQsIG9ubHk6 IHByZXBhcmVfbTIKICBpbXBsaWNpdCBub25lCiAgcHJpdmF0ZQogIHB1YmxpYyA6OiBhXzEKCmNv bnRhaW5zCgogIHN1YnJvdXRpbmUgYV8xICgpCiAgICBjbGFzcyhtX3QpLCBwb2ludGVyIDo6IG1t CiAgICBtbSA9PiBudWxsICgpCiAgICBjYWxsIHByZXBhcmVfbTIgKG1tKSAhIFJ1bnRpbWUgZXJy b3IgdHJpZ2dlcmVkIGhlcmUKICBlbmQgc3Vicm91dGluZSBhXzEKCmVuZCBtb2R1bGUgYQoKCm1v ZHVsZSBtMgogIHVzZSBtCiAgaW1wbGljaXQgbm9uZQogIHByaXZhdGUKICBwdWJsaWMgOjogbTJf dAoKICB0eXBlLCBleHRlbmRzIChtX3QpIDo6IG0yX3QKICAgICBwcml2YXRlCiAgIGNvbnRhaW5z CiAgICAgcHJvY2VkdXJlIDo6IHJlYWQgPT4gbTJfcmVhZAogIGVuZCB0eXBlIG0yX3QKY29udGFp bnMKCiAgc3Vicm91dGluZSBtMl9yZWFkIChtbSkKICAgIGNsYXNzKG0yX3QpLCBpbnRlbnQob3V0 KSwgdGFyZ2V0IDo6IG1tCiAgZW5kIHN1YnJvdXRpbmUgbTJfcmVhZAplbmQgbW9kdWxlIG0yCgpw cm9ncmFtIG1haW4KICB1c2UgbTJfdGVzdGJlZAogIHVzZSBhLCBvbmx5OiBhXzEKICBpbXBsaWNp dCBub25lCiAgcHJlcGFyZV9tMiA9PiBwcmVwYXJlX3doaXphcmRfbTIKICBjYWxsIGFfMSAoKQoK Y29udGFpbnMKCiAgc3Vicm91dGluZSBwcmVwYXJlX3doaXphcmRfbTIgKG1tKQogICAgdXNlIG0K ICAgIHVzZSBtMgogICAgY2xhc3MobV90KSwgaW50ZW50KGlub3V0KSwgcG9pbnRlciA6OiBtbQog ICAgaWYgKC5ub3QuIGFzc29jaWF0ZWQgKG1tKSkgIGFsbG9jYXRlIChtMl90IDo6IG1tKQogICAg c2VsZWN0IHR5cGUgKG1tKQogICAgdHlwZSBpcyAobTJfdCkKISAgICAgICBjYWxsIG1tJXJlYWQg KCkgICEgU2luY2UgbW0gaXMgcGFzc2VkIHRvIG5vbi1wb2ludGVyLCB0aGlzIGdlbmVyYXRlcyB0 aGUgZXJyb3IgY29kZS4KICAgIGVuZCBzZWxlY3QKICBlbmQgc3Vicm91dGluZSBwcmVwYXJlX3do aXphcmRfbTIKZW5kIHByb2dyYW0gbWFpbgohIHsgZGctZmluYWwgeyBzY2FuLXRyZWUtZHVtcC10 aW1lcyAiX2dmb3J0cmFuX3J1bnRpbWVfZXJyb3JfYXQiIDAgIm9yaWdpbmFsIiB9IH0KISB7IGRn LWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgIlBvaW50ZXIgYWN0dWFsIGFyZ3VtZW50IiAw ICJvcmlnaW5hbCIgfSB9Cg== --0000000000007d66ba05be6b10ed Content-Type: text/x-fortran; charset="US-ASCII"; name="pr99602b.f90" Content-Disposition: attachment; filename="pr99602b.f90" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kmpydzjh2 ISB7IGRnLWRvIHJ1biB9CiEgeyBkZy1vcHRpb25zICItZmNoZWNrPXBvaW50ZXIiIH0KIQohIFRl c3QgdGhlIGZpeCBmb3IgUFI5OTYwMiBpbiB3aGljaCB0aGUgcnVudGltZSBlcnJvciwKISAiUHJv Yy1wb2ludGVyIGFjdHVhbCBhcmd1bWVudCAnbW9kZWwnIGlzIG5vdCBhc3NvY2lhdGVkIiB3YXMg dHJpZ2dlcmVkCiEgYnkgdGhlIE5VTEwgcmVzdWx0IGZyb20gbW9kZWwlZ2V0X3Bhcl9kYXRhX3B0 ciAoInRlYSAiKQohCiEgQ29udHJpYnV0ZWQgYnkgSnVlcmdlbiBSZXV0ZXIgIDxqdWVyZ2VuLnJl dXRlckBkZXN5LmRlPgohCm1vZHVsZSBtb2RlbF9kYXRhCiAgdHlwZSA6OiBtb2RlbF9kYXRhX3QK ICAgICB0eXBlKG1vZGVscGFyX3JlYWxfdCksIGRpbWVuc2lvbig6KSwgcG9pbnRlciA6OiBwYXJf cmVhbCA9PiBudWxsICgpCiAgIGNvbnRhaW5zCiAgICAgcHJvY2VkdXJlIDo6IGdldF9wYXJfZGF0 YV9wdHIgPT4gbW9kZWxfZGF0YV9nZXRfcGFyX2RhdGFfcHRyX25hbWUKICAgICBwcm9jZWR1cmUg Ojogc2V0ID0+IGZpZWxkX2RhdGFfc2V0CiAgZW5kIHR5cGUgbW9kZWxfZGF0YV90CgogIHR5cGUg OjogbW9kZWxwYXJfcmVhbF90CiAgICAgY2hhcmFjdGVyICg0KSA6OiBuYW1lCiAgICAgcmVhbCg0 KSA6OiB2YWx1ZQogIGVuZCB0eXBlIG1vZGVscGFyX3JlYWxfdAoKICB0eXBlKG1vZGVscGFyX3Jl YWxfdCksIHRhcmdldCA6OiBuYW1lcygyKSA9IFttb2RlbHBhcl9yZWFsX3QoImZvbyAiLCAxLjAp LCAmCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW9kZWxw YXJfcmVhbF90KCJiYXIgIiwgMi4wKV0KICBpbnRlZ2VyIDo6IHJldHVybl92YWx1ZSA9IDAKCmNv bnRhaW5zCgogIGZ1bmN0aW9uIG1vZGVsX2RhdGFfZ2V0X3Bhcl9kYXRhX3B0cl9uYW1lIChtb2Rl bCwgbmFtZSkgcmVzdWx0IChwdHIpCiAgICBjbGFzcyhtb2RlbF9kYXRhX3QpLCBpbnRlbnQoaW4p IDo6IG1vZGVsCiAgICBjaGFyYWN0ZXIgKCopLCBpbnRlbnQoaW4pIDo6IG5hbWUKICAgIGNsYXNz KG1vZGVscGFyX3JlYWxfdCksIHBvaW50ZXIgOjogcHRyCiAgICBpbnRlZ2VyIDo6IGkKICAgIHB0 ciA9PiBudWxsICgpCiAgICBkbyBpID0gMSwgc2l6ZSAobW9kZWwlcGFyX3JlYWwpCiAgICAgICBp ZiAobW9kZWwlcGFyX3JlYWwoaSklbmFtZSA9PSBuYW1lKSBwdHIgPT4gbW9kZWwlcGFyX3JlYWwo aSkKICAgIGVuZCBkbwogIGVuZCBmdW5jdGlvbiBtb2RlbF9kYXRhX2dldF9wYXJfZGF0YV9wdHJf bmFtZQoKICBzdWJyb3V0aW5lIGZpZWxkX2RhdGFfc2V0ICh0aGlzLCBwdHIpCiAgICBjbGFzcyht b2RlbF9kYXRhX3QpLCBpbnRlbnQoaW5vdXQpIDo6IHRoaXMKICAgIGNsYXNzKG1vZGVscGFyX3Jl YWxfdCksIGludGVudChpbiksIHBvaW50ZXIgOjogcHRyCiAgICBpZiAoYXNzb2NpYXRlZCAocHRy KSkgdGhlbgogICAgICByZXR1cm5fdmFsdWUgPSBpbnQgKHB0ciV2YWx1ZSkKICAgIGVsc2UKICAg ICAgcmV0dXJuX3ZhbHVlID0gLTEKICAgIGVuZCBpZgogIGVuZCBzdWJyb3V0aW5lCgplbmQgbW9k dWxlIG1vZGVsX2RhdGEKCiAgdXNlIG1vZGVsX2RhdGEKICBjbGFzcyhtb2RlbF9kYXRhX3QpLCBh bGxvY2F0YWJsZSA6OiBtb2RlbAogIGNsYXNzKG1vZGVscGFyX3JlYWxfdCksIHBvaW50ZXIgOjog bmFtZV9wdHIKCiAgYWxsb2NhdGUgKG1vZGVsX2RhdGFfdCA6OiBtb2RlbCkKICBtb2RlbCVwYXJf cmVhbCA9PiBuYW1lcwoKICBjYWxsIG1vZGVsJXNldCAobW9kZWwlZ2V0X3Bhcl9kYXRhX3B0ciAo ImJhciAiKSkKICBpZiAocmV0dXJuX3ZhbHVlIC5uZS4gMikgc3RvcCAxCiAgY2FsbCBtb2RlbCVz ZXQgKG1vZGVsJWdldF9wYXJfZGF0YV9wdHIgKCJ0ZWEgIikpICEgVHJpZ2dlcmVkIHJ1bnRpbWUg ZXJyb3IKICBpZiAocmV0dXJuX3ZhbHVlIC5uZS4gLTEpIHN0b3AgMgplbmQKCg== --0000000000007d66ba05be6b10ed Content-Type: text/x-patch; charset="US-ASCII"; name="submit.diff" Content-Disposition: attachment; filename="submit.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kmpydzjw3 ZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL3RyYW5zLWV4cHIuYyBiL2djYy9mb3J0cmFuL3RyYW5z LWV4cHIuYwppbmRleCBiZmZlMDgwOGRmZi4uNzIzZWJjYzI3ZjggMTAwNjQ0Ci0tLSBhL2djYy9m b3J0cmFuL3RyYW5zLWV4cHIuYworKysgYi9nY2MvZm9ydHJhbi90cmFucy1leHByLmMKQEAgLTY2 NjMsNiArNjY2MywxOCBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdm Y19zeW1ib2wgKiBzeW0sCiAJICBjaGFyICptc2c7CiAJICB0cmVlIGNvbmQ7CiAJICB0cmVlIHRt cDsKKwkgIHN5bWJvbF9hdHRyaWJ1dGUgZnN5bV9hdHRyOworCisJICBpZiAoZnN5bSkKKwkgICAg eworCSAgICAgIGlmIChmc3ltLT50cy50eXBlID09IEJUX0NMQVNTICYmICFVTkxJTUlURURfUE9M WSAoZnN5bSkpCisJCXsKKwkJICBmc3ltX2F0dHIgPSBDTEFTU19EQVRBIChmc3ltKS0+YXR0cjsK KwkJICBmc3ltX2F0dHIucG9pbnRlciA9IGZzeW1fYXR0ci5jbGFzc19wb2ludGVyOworCQl9CisJ ICAgICAgZWxzZQorCQlmc3ltX2F0dHIgPSBmc3ltLT5hdHRyOworCSAgICB9CiAKIAkgIGlmIChl LT5leHByX3R5cGUgPT0gRVhQUl9WQVJJQUJMRSB8fCBlLT5leHByX3R5cGUgPT0gRVhQUl9GVU5D VElPTikKIAkgICAgYXR0ciA9IGdmY19leHByX2F0dHIgKGUpOwpAQCAtNjY4NSwxNyArNjY5Nywx NyBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdmY19zeW1ib2wgKiBz eW0sCiAJICAgICAgdHJlZSBwcmVzZW50LCBudWxsX3B0ciwgdHlwZTsKIAogCSAgICAgIGlmIChh dHRyLmFsbG9jYXRhYmxlCi0JCSAgJiYgKGZzeW0gPT0gTlVMTCB8fCAhZnN5bS0+YXR0ci5hbGxv Y2F0YWJsZSkpCisJCSAgJiYgKGZzeW0gPT0gTlVMTCB8fCAhZnN5bV9hdHRyLmFsbG9jYXRhYmxl KSkKIAkJbXNnID0geGFzcHJpbnRmICgiQWxsb2NhdGFibGUgYWN0dWFsIGFyZ3VtZW50ICclcycg aXMgbm90ICIKIAkJCQkgImFsbG9jYXRlZCBvciBub3QgcHJlc2VudCIsCiAJCQkJIGUtPnN5bXRy ZWUtPm4uc3ltLT5uYW1lKTsKIAkgICAgICBlbHNlIGlmIChhdHRyLnBvaW50ZXIKLQkJICAgICAg ICYmIChmc3ltID09IE5VTEwgfHwgIWZzeW0tPmF0dHIucG9pbnRlcikpCisJCSAgICAgICAmJiAo ZnN5bSA9PSBOVUxMIHx8ICFmc3ltX2F0dHIucG9pbnRlcikpCiAJCW1zZyA9IHhhc3ByaW50ZiAo IlBvaW50ZXIgYWN0dWFsIGFyZ3VtZW50ICclcycgaXMgbm90ICIKIAkJCQkgImFzc29jaWF0ZWQg b3Igbm90IHByZXNlbnQiLAogCQkJCSBlLT5zeW10cmVlLT5uLnN5bS0+bmFtZSk7Ci0JICAgICAg ZWxzZSBpZiAoYXR0ci5wcm9jX3BvaW50ZXIKLQkJICAgICAgICYmIChmc3ltID09IE5VTEwgfHwg IWZzeW0tPmF0dHIucHJvY19wb2ludGVyKSkKKwkgICAgICBlbHNlIGlmIChhdHRyLnByb2NfcG9p bnRlciAmJiAhZS0+dmFsdWUuZnVuY3Rpb24uYWN0dWFsCisJCSAgICAgICAmJiAoZnN5bSA9PSBO VUxMIHx8ICFmc3ltX2F0dHIucHJvY19wb2ludGVyKSkKIAkJbXNnID0geGFzcHJpbnRmICgiUHJv Yy1wb2ludGVyIGFjdHVhbCBhcmd1bWVudCAnJXMnIGlzIG5vdCAiCiAJCQkJICJhc3NvY2lhdGVk IG9yIG5vdCBwcmVzZW50IiwKIAkJCQkgZS0+c3ltdHJlZS0+bi5zeW0tPm5hbWUpOwpAQCAtNjcx OSwxNSArNjczMSwxNSBAQCBnZmNfY29udl9wcm9jZWR1cmVfY2FsbCAoZ2ZjX3NlICogc2UsIGdm Y19zeW1ib2wgKiBzeW0sCiAgICAgICAgICAgZWxzZQogCSAgICB7CiAJICAgICAgaWYgKGF0dHIu YWxsb2NhdGFibGUKLQkJICAmJiAoZnN5bSA9PSBOVUxMIHx8ICFmc3ltLT5hdHRyLmFsbG9jYXRh YmxlKSkKKwkJICAmJiAoZnN5bSA9PSBOVUxMIHx8ICFmc3ltX2F0dHIuYWxsb2NhdGFibGUpKQog CQltc2cgPSB4YXNwcmludGYgKCJBbGxvY2F0YWJsZSBhY3R1YWwgYXJndW1lbnQgJyVzJyBpcyBu b3QgIgogCQkJCSAiYWxsb2NhdGVkIiwgZS0+c3ltdHJlZS0+bi5zeW0tPm5hbWUpOwogCSAgICAg IGVsc2UgaWYgKGF0dHIucG9pbnRlcgotCQkgICAgICAgJiYgKGZzeW0gPT0gTlVMTCB8fCAhZnN5 bS0+YXR0ci5wb2ludGVyKSkKKwkJICAgICAgICYmIChmc3ltID09IE5VTEwgfHwgIWZzeW1fYXR0 ci5wb2ludGVyKSkKIAkJbXNnID0geGFzcHJpbnRmICgiUG9pbnRlciBhY3R1YWwgYXJndW1lbnQg JyVzJyBpcyBub3QgIgogCQkJCSAiYXNzb2NpYXRlZCIsIGUtPnN5bXRyZWUtPm4uc3ltLT5uYW1l KTsKLQkgICAgICBlbHNlIGlmIChhdHRyLnByb2NfcG9pbnRlcgotCQkgICAgICAgJiYgKGZzeW0g PT0gTlVMTCB8fCAhZnN5bS0+YXR0ci5wcm9jX3BvaW50ZXIpKQorCSAgICAgIGVsc2UgaWYgKGF0 dHIucHJvY19wb2ludGVyICYmICFlLT52YWx1ZS5mdW5jdGlvbi5hY3R1YWwKKwkJICAgICAgICYm IChmc3ltID09IE5VTEwgfHwgIWZzeW1fYXR0ci5wcm9jX3BvaW50ZXIpKQogCQltc2cgPSB4YXNw cmludGYgKCJQcm9jLXBvaW50ZXIgYWN0dWFsIGFyZ3VtZW50ICclcycgaXMgbm90ICIKIAkJCQkg ImFzc29jaWF0ZWQiLCBlLT5zeW10cmVlLT5uLnN5bS0+bmFtZSk7CiAJICAgICAgZWxzZQo= --0000000000007d66ba05be6b10ed--