From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id E8E2C3857C6F for ; Fri, 22 Apr 2022 13:56:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E8E2C3857C6F Received: by mail-io1-xd2a.google.com with SMTP id 79so8650462iou.7 for ; Fri, 22 Apr 2022 06:56:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tXIUIESmn56vUQlM8O8PFaECTokUD/5WMXdUgy+LBVc=; b=EdUWmLp9hVA92vWPKwlY5rNZpyW9blsmWV31pkGMUSS6lHiEGXzvAPU8+ilYd6vlDr JAEvDGCzRnVbfvGfZga1laXqVHNVL3fpi0m4GzRGHyhxr4tucgVlyGWKdwqknPz9CDtO PTAPi4yICQOmrkVrLLlZIPyfcSlBa98z3kYaxr06e5vMJWV7FWqy6Cl3+YQbM4lztg9o wfHDQ+Rn/ASdee/xi7Q0LlmUmjnh8/GkA9me5SasznDV9ECXfJJPl4lGhl5s+WmmPbTK eWLdZ+1kPawR5mV4QHgXFMp7h2hhb7Q2QmlatnrLLKr6cRnzNB0xssE13rQPP8xllL48 EMYA== X-Gm-Message-State: AOAM531ZARv9wtExSD8EOxD+OyfDZTeQOOBAyHB0f0fMVzO1AbkENH5j 6jQPwHzfXuhIkhKElb5amPcfB9Rf0gmmqQ== X-Google-Smtp-Source: ABdhPJyay7HXdOrDA792kB5DkwZSlF6ctIwFeNrLzrmtdZJTaOzvQIwC+sJe/04SQyc07SuE8/rnJg== X-Received: by 2002:a05:6638:199:b0:326:6def:2be4 with SMTP id a25-20020a056638019900b003266def2be4mr2105141jaq.244.1650635799296; Fri, 22 Apr 2022 06:56:39 -0700 (PDT) Received: from murgatroyd.Home (71-211-158-194.hlrn.qwest.net. [71.211.158.194]) by smtp.gmail.com with ESMTPSA id f4-20020a056e0204c400b002caa9f3cc3fsm1365863ils.56.2022.04.22.06.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 06:56:38 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/4] More const use and alloca avoidance in coff-pe-read.c Date: Fri, 22 Apr 2022 07:56:32 -0600 Message-Id: <20220422135632.2615890-5-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220422135632.2615890-1-tromey@adacore.com> References: <20220422135632.2615890-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2022 13:56:41 -0000 This changes another function in coff-pe-read.c to use 'const' more, and to avoid the use of alloca by instead using std::string. --- gdb/coff-pe-read.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 5bf0e2dc7f0..d533a96ef6d 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -525,20 +525,20 @@ read_pe_exported_syms (minimal_symbol_reader &reader, /* First handle forward cases. */ if (func_rva >= export_rva && func_rva < export_rva + export_size) { - char *forward_name = (char *) (erva + func_rva); - char *funcname = (char *) (erva + name_rva); - char *forward_dll_name = forward_name; - char *forward_func_name = forward_name; - char *sep = strrchr (forward_name, '.'); - - if (sep) + const char *forward_name = (const char *) (erva + func_rva); + const char *funcname = (const char *) (erva + name_rva); + const char *forward_dll_name = forward_name; + const char *forward_func_name = forward_name; + const char *sep = strrchr (forward_name, '.'); + + std::string name_storage; + if (sep != nullptr) { int len = (int) (sep - forward_name); - forward_dll_name = (char *) alloca (len + 1); - strncpy (forward_dll_name, forward_name, len); - forward_dll_name[len] = '\0'; - forward_func_name = ++sep; + name_storage = std::string (forward_name, len); + forward_dll_name = name_storage.c_str (); + forward_func_name = sep + 1; } if (add_pe_forwarded_sym (reader, funcname, forward_dll_name, forward_func_name, ordinal, @@ -552,7 +552,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, if ((func_rva >= section_data[sectix].rva_start) && (func_rva < section_data[sectix].rva_end)) { - char *sym_name = (char *) (erva + name_rva); + const char *sym_name = (const char *) (erva + name_rva); section_found = 1; add_pe_exported_sym (reader, sym_name, func_rva, ordinal, @@ -563,7 +563,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, } if (!section_found) { - char *funcname = (char *) (erva + name_rva); + const char *funcname = (const char *) (erva + name_rva); if (name_rva == 0) { -- 2.34.1