From patchwork Fri Mar 24 10:35:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 74481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp519747vqo; Fri, 24 Mar 2023 03:35:39 -0700 (PDT) X-Google-Smtp-Source: AKy350a0tbcKBwLx1BAa4Ag2TknuM6PCT+tKywOYykGtefhj29sPnZ1mKeNXwFg2bZFtFEqHjbeJ X-Received: by 2002:a17:907:8c83:b0:939:a610:fc32 with SMTP id td3-20020a1709078c8300b00939a610fc32mr2504237ejc.53.1679654138921; Fri, 24 Mar 2023 03:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679654138; cv=none; d=google.com; s=arc-20160816; b=km603O/Sgx9913sZo58EtSLcWo57UKYj06n26lrZXqU0wmoy1GmNZx0guApgiV13uZ 6Iz/ewrVnCVmqWIYzg4rFU61JPaWFv7P5vYscy+9axK71Bq7EtnXWmJ8ZsOdwXnY9r9P dt376XHJLHDjDfwM75KGNhw0DKdYBlYyau+GqpWmJ7xf8Trm6mqn0m9xyfRs0RtKmkZk lB8OQX9fDecfMEtaIi382TXELh7GYIrxCS5gYg90AUWG2i29o/lddYyf1G/OkAOtMRfd f5iHSvJi8YbeAAlEUTXjcMwXKRdSH43dde1Sf/oOQW+rVvpo096uKA0Sz6gq9VXDn5wN zp2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=VOY6fubyOzh6iygzKg0b+C5vaikAtGE0VgxgW4wBDfc=; b=H2fQLegYhAXHHw8UFMhjkxb/risXAeRkxTOqN/xFXz4Z+7uv0acJGI+IB7JaiaUsio 3CLEz00BKcyWU+GIR2wc9Woivd+IVTyKHmlJYeaKqcmsZXpdxlyqLQJmrMJexp5hDrhR b5OJSRdQSWdNBRG1EA0ZqeiUMq+/tAipHPHeAvTIz6AS1r46y1dqXdCgFyxLHJJng4YO iEYiiqYvloJPVUYDiMyXRwCFyXRjhQdTCwJWU8+esVyBxnGx+OXOc1NcgSh+5otkCyxM +YsFG4EES/doo5f0tJU7NniznDj+Crd9O7eIjs4WmWLuI7QfcE/pCF8uZbQgczFS9Pmb k8eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=cOsgbdQm; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id j15-20020a170906474f00b0093defbd6295si1593788ejs.1052.2023.03.24.03.35.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 03:35:38 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=cOsgbdQm; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D3384385843A for ; Fri, 24 Mar 2023 10:35:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3384385843A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679654137; bh=VOY6fubyOzh6iygzKg0b+C5vaikAtGE0VgxgW4wBDfc=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=cOsgbdQmjD1/43uZogF59vjCjFIlDkwlcEx7FY5LnSkaB9LxlTvXdNjo2przJGoTY P8WgSoD/6U7RYhI1zIobNLELo5LjMydS8Zn46rTHzciy5eRCEVDyCJPIv3N9vVedDb buIDhJbby4YPhuM1hR4ObsQX4fuFHNWc5paY1MPw= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id 146363858422 for ; Fri, 24 Mar 2023 10:35:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 146363858422 Received: by mail-pj1-x102e.google.com with SMTP id x15so1154656pjk.2 for ; Fri, 24 Mar 2023 03:35:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679654128; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VOY6fubyOzh6iygzKg0b+C5vaikAtGE0VgxgW4wBDfc=; b=asTk284b6cXFtnD4LL4FN/ecNd1xe8ubZ0WVjcZyiiuVpuw/m08tIa9t36ixH/DhJh 7c4u/K2wylCHWGuwVzVnpmW2T8LvhAxp1fX05hV82pNMfLe+4kJXuptPhaUBdasOUBLu 3xpFtg0jSjihmLR+9uz0WjlsaPgkuKUOHWJgmtf2N8JPpNjS6vfx65TdBMPLT9H8FtJc 09UpBqfW4j122E+PvcIRKbT7SQ+NK4Zpc5qmynsRyWikCc3DmYSuaRLMKtnSrrsJvfvJ t2dKwRK0au5YzvCmmHlEtNqHeRNOR8U8LPUPl3nf+fnEKADuJrlpV8vlz0EgS3svEsgw mS/w== X-Gm-Message-State: AO0yUKX98q3aADTifKC20fFFV3L0R6Oaecex2Pbr1KgtJcLIiZ7kwOn/ +s6hm5vU4ekQIJgzMkbQijFf2zGaoSU= X-Received: by 2002:a05:6a20:1aa1:b0:d9:11d2:383f with SMTP id ci33-20020a056a201aa100b000d911d2383fmr2207187pzb.53.1679654127892; Fri, 24 Mar 2023 03:35:27 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id y19-20020a62b513000000b005a75d85c0c7sm13466024pfe.51.2023.03.24.03.35.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 03:35:27 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 541361143B45; Fri, 24 Mar 2023 21:05:25 +1030 (ACDT) Date: Fri, 24 Mar 2023 21:05:25 +1030 To: binutils@sourceware.org Subject: Tidy string_ptr increment Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761245018810798742?= X-GMAIL-MSGID: =?utf-8?q?1761245018810798742?= I was going to make this vars->string_ptr += strlen (vars->string_ptr) + 1; but figured we ought to be able to trust sprintf return value nowadays. * peicode.h (pe_ILF_make_a_symbol): Use sprintf output to increment string_ptr to end of new string. diff --git a/bfd/peicode.h b/bfd/peicode.h index f1f3ce81533..f16aeca7a1b 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -576,7 +576,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, esym = vars->esym_ptr; /* Copy the symbol's name into the string table. */ - sprintf (vars->string_ptr, "%s%s", prefix, symbol_name); + int len = sprintf (vars->string_ptr, "%s%s", prefix, symbol_name); if (section == NULL) section = bfd_und_section_ptr; @@ -612,7 +612,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, vars->table_ptr ++; vars->native_ptr ++; vars->esym_ptr ++; - vars->string_ptr += strlen (symbol_name) + strlen (prefix) + 1; + vars->string_ptr += len + 1; BFD_ASSERT (vars->string_ptr < vars->end_string_ptr); }