From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id C49E4386547E for ; Mon, 1 Jul 2024 06:35:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C49E4386547E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C49E4386547E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::231 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719815715; cv=none; b=FrCOqERF5Hx+oRdur20V4FDDaXWLNsOA6rH8ySnGTtVhudpZxKeXnr2AG8OkHBIolLgZDbWOKM15tP4H6mTrHDPvXt0tldAYPks5YIJHG1cps00ESFbKO8TN5aBpJaw61asuvDVFFlyMOw5avmh5UjHUtoatGLY4PlxqU8Ju6XA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719815715; c=relaxed/simple; bh=klLwIlVEyg8mRMm/L+bqOLKsHhLWZwmU+0rLE8RjaXo=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=xnyBYOb+HOYZ9pmkJgbYXRuAox4svAxWQRYmKUtxjW9UZKTawZTIPaf/pvsbBVNNBNEuScV2nEl+ZMpLwIL1ptT/VRGuvQBRi/VL2O+lyZQJV974JWBkm8oKxBkznsZ2RuRvSnvkI+IbEl0aW477XxBimteZIQ0rOde3dOuRRoc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2ebe6495aedso26883231fa.0 for ; Sun, 30 Jun 2024 23:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719815712; x=1720420512; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=YLf6ZV9p0CGsWoz6BrIEWqNA1hmPAFow2G9e9lfn+Fw=; b=RL2ZKTfChaazq42oPoQ4eVbNOYzvljY2uF1ApvigReXiPDHqiw67lgVClF8XP2j7+i shJoWN1nXEeg7GLIp3wL/IyCNHFdyDrdn8h9tNDPvf6K3AZUnks4zqG67VvjBJXKLS2C JR6b9kvcSrEca9WQpTx37bslvOEuX/w2tzrh4CctUa2toPC4nClP4O+DRKwvsubRQyEP CKaXH+26bR+Q6YmH6dlPKth/i4MfuypG+e3lfb4p84AXTa3D6MJOoRQrv8Ph87Bg6JuX 1iFEV+Q5XXpwwjjyFuLzevRwOgFi73pRVLxy26pf3VeCk97d1b9l/ojof/V3ri9ahqCE OE9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719815712; x=1720420512; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YLf6ZV9p0CGsWoz6BrIEWqNA1hmPAFow2G9e9lfn+Fw=; b=g2xH/EGh5G9ZqQ253pFw/3sG/CH/VY7qe/QYA0xYKIamR59zpuTd/KicXvliDVRWkz hvzHb4DY9krfSDgarQlLIdfExSz00zjt1FiqiO5airRATeMUMHEPQUmE8O97ul9AV/X3 H5HHEPSz1i9Srve9qmDAHSilEpBoWH3bPmXQtEiwOBdkOP9roVgcboJsT6MtPlejN/V8 7ps58kl9p9Mu3dP9u/0cR9dBklth4k1IH6YuSRwdJok4xK+xLnZzrqlv53P5cgsxR1Kn RzWfdsYbxypH+fOJ19ka8MGMz2MHZ0/IcqJufe6bzlaspKfKiele8jcZc3TEHVCWNFMk iJVw== X-Forwarded-Encrypted: i=1; AJvYcCWOVsIwUkgS2KiY5Xi3ElFPeve0PKbxK8QierhoQcAtOX/sCEFdHjCcQUJO6UigY7m+k1ZkPZZ4sEiUAI3xEQreY3gSsmm/rg== X-Gm-Message-State: AOJu0YztEOQBFF41VhVsJThZy6fE7JmU1FtoIcYHcXIqq3F035ww+R0J U4Yz/ZJyCPz9ZKJmRt0Al61o/2DhSnz7TPNyrEAkYTCyBeSTuxVwlc7WXhUC7XxIOUaGV2fYt4Q = X-Google-Smtp-Source: AGHT+IFJqan762sOyXGRv6CMnCkgFOogqHM43uV+ijDKIkc+PRfCSmd9/dre1eq0ArFERw26yZaZDg== X-Received: by 2002:a2e:a98e:0:b0:2ec:5f85:61d8 with SMTP id 38308e7fff4ca-2ee5e3927dfmr31007461fa.16.1719815712212; Sun, 30 Jun 2024 23:35:12 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1facea87d09sm49267965ad.55.2024.06.30.23.35.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 30 Jun 2024 23:35:11 -0700 (PDT) Message-ID: <5bdf0229-4de0-4cba-8dc3-34380f7abf7a@suse.com> Date: Mon, 1 Jul 2024 08:35:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 3/7] ldlang.*: process ASCII command To: binutils@emagii.com Cc: nickc@redhat.com, Ulf Samuelsson , binutils@sourceware.org References: <20240628214627.6726-1-binutils@emagii.com> <20240628214627.6726-4-binutils@emagii.com> Content-Language: en-US From: Jan Beulich Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <20240628214627.6726-4-binutils@emagii.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3024.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,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 List-Id: On 28.06.2024 23:46, binutils@emagii.com wrote: > --- a/ld/ldlang.c > +++ b/ld/ldlang.c > @@ -8663,15 +8663,20 @@ lang_add_data (int type, union etree_union *exp) > new_stmt->type = type; > } > > -void > -lang_add_string (const char *s) > +/* Convert escape codes in S. > + Supports \n, \r, \t and \NNN octals. > + Returns a copy of S in a malloc'ed buffer. */ > + > +static char * > +convert_string (const char * s) > { > - bfd_vma len = strlen (s); > - bfd_vma i; > - bool escape = false; > + size_t len = strlen (s); > + size_t i; > + bool escape = false; > + char * buffer = malloc (len + 1); You want to avoid crashing if this allocation fails. Perhaps by simply using xmalloc() or e.g. XNEWVEC(). > + char * b; > > - /* Add byte expressions until end of string. */ > - for (i = 0 ; i < len; i++) > + for (i = 0, b = buffer; i < len; i++) > { > char c = *s++; > > @@ -8729,21 +8734,53 @@ lang_add_string (const char *s) > } > break; > } > - > - lang_add_data (BYTE, exp_intop (c)); > escape = false; > } > else > { > if (c == '\\') > - escape = true; > - else > - lang_add_data (BYTE, exp_intop (c)); > + { > + escape = true; > + continue; > + } > } > + > + * b ++ = c; > } > > - /* Remeber to terminate the string. */ > - lang_add_data (BYTE, exp_intop (0)); > + * b = 0; > + return buffer; > +} > + > +void > +lang_add_string (size_t size, const char *s) > +{ > + size_t len; > + size_t i; > + char * string; > + > + string = convert_string (s); > + len = strlen (string); > + > + /* Check if it is ASCIZ command (len == 0) */ > + if (size == 0) > + /* Make sure that we include the terminating nul byte. */ > + size = len + 1; > + else if (len >= size) > + { > + len = size - 1; > + > + einfo (_("%P:%pS: warning: ASCII string does not fit in allocated space," > + " truncated\n"), NULL); > + } > + > + for (i = 0 ; i < len ; i++) Nit: No blanks before ; please. Jan