From patchwork Fri Oct 16 17:24:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1383472 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Y29pWfHo; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CCY1D2WVrz9sTD for ; Sat, 17 Oct 2020 04:24:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A3DBD3851C3D; Fri, 16 Oct 2020 17:24:28 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by sourceware.org (Postfix) with ESMTPS id 0D3AA3857023 for ; Fri, 16 Oct 2020 17:24:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0D3AA3857023 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qk1-x72e.google.com with SMTP id z6so2527799qkz.4 for ; Fri, 16 Oct 2020 10:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=2B3JOGn2moFruI5KV4SkcE1JnWPLaxHlinAaCgAvvvg=; b=Y29pWfHooIjW5BJ0qpHBGmIrRc2xrgJZIlvEwWVnF1HyVuQU3fWsNsbHIvkMuzkDxP 5Rwckj7cLwOUUpuwv3vTstSwetelMPbfwIF5cVsGmF3e4YHI4G+O+sBtxrAOE9IKmzCV wyR+arqWgzPcz3wB2FVvH8DVJ15H/ojXsF+XzRAT2mdhwxOkGIJ+bp8HuxU1ApX9cEZ+ jVYV74oA5SVyATX7Vjl3DI1EHa7o82Oi8tzUazVCQZS5GDP9qDpWsdcq8fYLohFsiTJY 7yuuncIn8MSmX4sMzll2RPyN9ITjjH5cZcPHjH7IYGEY8ef1jLjFvqD1rYMr/+PG169s Pkzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=2B3JOGn2moFruI5KV4SkcE1JnWPLaxHlinAaCgAvvvg=; b=XYrCu9wUUgcFcyGak8WccoDvYzxbkrCSItHNlFotGbDAdPaD6vVeYQf2NpENvWnz5U +2LB8nrRZKGU3JRzODAQ6uGHuuZkK9rf11bIeGnmH6Yr8FVsd2NB4c6cmkFWgcKphmRk QViUkQe/6SlbK3RRBPF/W30NoBefCshijmZKVrn9FB4VOFl6gO039iXzDpsGQxwOuc4H s4eiZT1iEdeMAVy0USIvpwq+8KVc4il+Wsv1/+31xA1zQaOCl1ehIFb+bcfUl7JjQvJV Ptm0fcejtvkur5j81bZjqNczPab1WE/q6bwz5Knuet56VmaagHFElEPkswdFQRHPLCFq mbxA== X-Gm-Message-State: AOAM532HwN3Do24ETBjoXgmOdQ1nk8yBaDct8z8Gpec9W5zHKfk5hPLB 3TZOdBiFotQqr/qOPntGvxZIxJcQSzshVw== X-Google-Smtp-Source: ABdhPJyen0iz1fLaOkGBDT1D2zROCXQm+coB8hq+x+tVkOhSYriCF2nf3OjL9IWwaQnQZDAnV8W5Cw== X-Received: by 2002:a37:6285:: with SMTP id w127mr5086378qkb.454.1602869065057; Fri, 16 Oct 2020 10:24:25 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:a104:3710:c1c2:305f? ([2620:10d:c091:480::1:cfb1]) by smtp.googlemail.com with ESMTPSA id s11sm1103296qks.64.2020.10.16.10.24.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Oct 2020 10:24:24 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Fix nullptr deref [pr97460[ Message-ID: <2007f53f-72e3-9ccd-00c4-eff7295c7e2c@acm.org> Date: Fri, 16 Oct 2020 13:24:22 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, 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-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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" My changes to friend handling meant that there are now cases where a friend doesn't get a lang-specific object. So we need to check there is one before looking inside it. PR c++/97460 gcc/cp/ * pt.c (push_template_decl): Check DECL_LANG_SPECIFIC in friend case. gcc/testsuite/ * g++.dg/template/pr97460.C: New. pushing to trunk nathan diff --git c/gcc/cp/pt.c w/gcc/cp/pt.c index 2a9a8fafaca..dc664ec3798 100644 --- c/gcc/cp/pt.c +++ w/gcc/cp/pt.c @@ -5877,7 +5877,8 @@ push_template_decl (tree decl, bool is_friend) || TREE_CODE (ctx) == FUNCTION_DECL || (CLASS_TYPE_P (ctx) && TYPE_BEING_DEFINED (ctx)) || (TREE_CODE (decl) == TYPE_DECL && LAMBDA_TYPE_P (TREE_TYPE (decl))) - || (is_friend && !DECL_TEMPLATE_INFO (decl))) + || (is_friend && !(DECL_LANG_SPECIFIC (decl) + && DECL_TEMPLATE_INFO (decl)))) { if (DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl) diff --git c/gcc/testsuite/g++.dg/template/pr97460.C w/gcc/testsuite/g++.dg/template/pr97460.C new file mode 100644 index 00000000000..6dea4898997 --- /dev/null +++ w/gcc/testsuite/g++.dg/template/pr97460.C @@ -0,0 +1,9 @@ +// PR 97460 +// ICE, null dereference + +class io_context { + template class basic_executor_type; +}; +template class io_context::basic_executor_type { + template friend class basic_executor_type; +};