From patchwork Thu Mar 24 13:12:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Clifton X-Patchwork-Id: 52318 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 10A553888C5B for ; Thu, 24 Mar 2022 13:13:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10A553888C5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648127593; bh=QF1s6tWhD9+P+wAMorVIOeNEY5A0LhIWbd0dZ7kiedE=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=h9ynMB/3llWcvuLWhA5h42DqSp+Afy7w/8m1HZKK3DzXF2QaCvYfIkFjRxEjkQvzI mejoUdLHYflHDF3PNySzK0OXuOlbRzNIw7exy3KZTeUtf3RolCKCco/NmqdP+KVJpy qydykk72b3cyVkRo8qVpKrfgloTOlZ8YO5ezk4PY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 188F33858C2C for ; Thu, 24 Mar 2022 13:12:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 188F33858C2C Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-mXlUV_FQNnaQbWl1f83tjg-1; Thu, 24 Mar 2022 09:12:36 -0400 X-MC-Unique: mXlUV_FQNnaQbWl1f83tjg-1 Received: by mail-wr1-f70.google.com with SMTP id a5-20020adfc445000000b00203dcb13954so1655185wrg.23 for ; Thu, 24 Mar 2022 06:12:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:from:subject; bh=3m/gFD2pZ3SHD6b7aSmsZs6REInKAzQQSLNkrigHk70=; b=d9/0CfxWA9ovlKOEfj8RrI5x5ULH7QoBh2tWhbphjlCzkbwN7aI+ey0FazpCqmraKX lSKCtuUT/TVTvwpxf5Xz8/EZW50kC/6SuvnCz2QGHL1B1HJS/jvwHQAw9YeGzyssPeS9 AuDSfO7MAlLH25OauQxt38w2ZPzKu+Pm+xcnRHiFxCesbZtfVRfuZx3bN3DIyrGwpt22 /U8bl8g5c1URTfP5cSdPzQg/XUVMZdrBwJhiMCjjRotF322AF9I39YtUjQKWZeKTineS POWN7UDWEVzw200/phDmV0BoCQsPuXboHLfsotbMlBTl9lju9ORq1DdB5rdQwbtn4sgn BX5w== X-Gm-Message-State: AOAM531x7SbQwiLpXJqDwk2Io7PalBByzUsLBEdyIh7wWJSK6f+CSKin VyIeHjLFIEGz083JYIR0Gj92EkRSABVOxUnaNR1D7snHk+ECu/3f/LevybHzPV+tOxc4NlEOcdL sz6+5XBGjF6Ea27eRVM+yxmh7G0zRQOWoSEkrjcVS6BbtAgIfH5F6xhchdq0VJnytIQ== X-Received: by 2002:adf:fc47:0:b0:203:dda1:4311 with SMTP id e7-20020adffc47000000b00203dda14311mr4555205wrs.301.1648127555493; Thu, 24 Mar 2022 06:12:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBBEJPRJr+SHFRY4jOcK7TcXBFuXYYZpDbJdidWjhCcL4WxNI9Q7QCLq7dPME5CDSJn/6HeQ== X-Received: by 2002:adf:fc47:0:b0:203:dda1:4311 with SMTP id e7-20020adffc47000000b00203dda14311mr4555185wrs.301.1648127555105; Thu, 24 Mar 2022 06:12:35 -0700 (PDT) Received: from [192.168.1.6] (adsl-2-solo-173-39.claranet.co.uk. [80.168.173.39]) by smtp.gmail.com with ESMTPSA id y15-20020a05600015cf00b00203e324347bsm3103968wry.102.2022.03.24.06.12.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Mar 2022 06:12:34 -0700 (PDT) Message-ID: <5d2cd702-c556-363b-f4db-227fe015a723@redhat.com> Date: Thu, 24 Mar 2022 13:12:33 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 To: GCC Patches Subject: Fix another Rust demangling bugs (PR 105039) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-GB X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Nick Clifton via Gcc-patches From: Nick Clifton Reply-To: Nick Clifton Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi Guys, Attached is a proposed patch to fix another Rust demangling bug reported in PR 105039. I would like to say that this is the last time that we will see this problem for the Rust demangler, but I am not that naive... OK to apply ? Cheers Nick diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c index 3b24d63892a..d601182ac50 100644 --- a/libiberty/rust-demangle.c +++ b/libiberty/rust-demangle.c @@ -126,7 +126,7 @@ parse_integer_62 (struct rust_demangler *rdm) return 0; x = 0; - while (!eat (rdm, '_')) + while (!eat (rdm, '_') && !rdm->errored) { c = next (rdm); x *= 62; @@ -1148,6 +1148,15 @@ demangle_const (struct rust_demangler *rdm) if (rdm->errored) return; + if (rdm->recursion != RUST_NO_RECURSION_LIMIT) + { + ++ rdm->recursion; + if (rdm->recursion > RUST_MAX_RECURSION_COUNT) + /* FIXME: There ought to be a way to report + that the recursion limit has been reached. */ + goto fail_return; + } + if (eat (rdm, 'B')) { backref = parse_integer_62 (rdm); @@ -1158,7 +1167,7 @@ demangle_const (struct rust_demangler *rdm) demangle_const (rdm); rdm->next = old_next; } - return; + goto pass_return; } ty_tag = next (rdm); @@ -1167,7 +1176,7 @@ demangle_const (struct rust_demangler *rdm) /* Placeholder. */ case 'p': PRINT ("_"); - return; + goto pass_return; /* Unsigned integer types. */ case 'h': @@ -1200,18 +1209,20 @@ demangle_const (struct rust_demangler *rdm) break; default: - rdm->errored = 1; - return; + goto fail_return; } - if (rdm->errored) - return; - - if (rdm->verbose) + if (!rdm->errored && rdm->verbose) { PRINT (": "); PRINT (basic_type (ty_tag)); } + + fail_return: + rdm->errored = 1; + pass_return: + if (rdm->recursion != RUST_NO_RECURSION_LIMIT) + -- rdm->recursion; } static void