From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2043.outbound.protection.outlook.com [40.107.13.43]) by sourceware.org (Postfix) with ESMTPS id B609F3858C39 for ; Tue, 14 Feb 2023 15:53:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B609F3858C39 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-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkzBzOO5BesbZMsRNjDi9vr10wMjUq4GMTDd7nUxGyy15FopH/aOxal6aibrH8bxnsnDpGlzS9D3QfKkGIenPCq/bRUrcxH8tn5i7H/8g7QUWiTIM3aqZBQf/HIbls9qcZQHPG16Lc3YM5H77vXERdRt0iXh9l/3xaNmXyXyfY6yR35p39ATmy6yxkoHalVU3htWXW3m+l8M07Nasx0LYIwDFR9U/INbzUaQX8liY1jR8kha1gyPO/r962Lmd4/ywb/EykFhohye1gjkPhdFg98yZvkOGn2GKHhiBO8m/BOSVX3WExUhkzwc2aROPBb8vW3uOPIJamAWv2DqhR42uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Zy6DU4nOV1vE+n7ERBV9YVMCNCotQtoPOSBTcYWpJV8=; b=X3h326VRdjQd8TKRG9J+7WHovPU4/Hd3Ng+6wz02y4IcSeG+drmq7sUhhN3jysPh4LkDB9m6AMbc6mMEJnvPzhmWiXdhDtuyI0zf6z3I78lS69JlBV5AqTGJUhB8MN5bow+rQn38D5vDu2XGZ1fy2qcA3kYnVfuuCvdmj+UksiEUuuZVBS08yQ/MVBiF8polo0VmYXsKFwp037s80UMnlguOZRGkJPZFwLOLWuGjP3w5YeTa/1RAjnw0RxjjqmYXh7oxujgcRt5nJNBiKDIjL0xnswOI34aTY2wU6EfqpQOaZ0yuEtzoN8xUuesuwrRdAiPSu/3pUq22KTxSEizpDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zy6DU4nOV1vE+n7ERBV9YVMCNCotQtoPOSBTcYWpJV8=; b=aa2NvpRFY5Ryr07cBqHXLNL0CQWAsqqWxOx5+G9/Rlj9GkMR9emeEJ+Mv2/gBi3DFuz9iBTxsyfMlG90CT67/pW+mMtVhb+lHoCVzDuUnVDjwnM4kwdBtWQimJECT3A5+4d7GnlmLkPY6ldCbBqm24BnfYnpu9BUgGTzIQydCe0fK4SyZUZcKYqE6xxnu305zKK/5By134g1LDNdtig0hnlKemTFQvXUhst62+fbOiX4f11Ve/vqo7PGRl89RMIzw/PAlUq3xCZkFw8wx3Jf2Tq5WcoDbgy0VouMlcQ91RVGjXmwKWq/19M2d3kIPNs7NdD0hb8lszz69j4+teSpWA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DBBPR04MB7834.eurprd04.prod.outlook.com (2603:10a6:10:1ee::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:53:13 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6086.024; Tue, 14 Feb 2023 15:53:13 +0000 Message-ID: Date: Tue, 14 Feb 2023 16:53:10 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Content-Language: en-US To: Binutils Cc: Nick Clifton From: Jan Beulich Subject: [PATCH] gas: buffer_and_nest() needs to pass nul-terminated string to temp_ilp() Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0141.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9e::20) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DBBPR04MB7834:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d940a82-aba1-4a36-8439-08db0ea39451 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4qEJbz0PVWHhlIfYxNX4LmeFJDEhIhw6MNK91MbLhfOQZfG/30vCg7aaXEIYHxusIrPLFIDWM9T3vvJZPO6CjbXaFLBAs6FLTPEilRRCm5LaF+kGQViJjXY5E6D50iGBO9PQPWdhavVSjP0nrNlN+N6z0iDhX3G8Wbd0SONpalvEOx1KszusfAqEF0Wdqjh8M+e5BzkvNXUSD7/nc3tiJtXx80EV7CEPABfkwaZSTROs+6lAUOebxyw7Yn/hOifAk2NGDD70iN7Ou1PPhqrZgRB+LneTWouVTB+bHTy4jjBIfo0mbiLv4tYR8brkZzYdizm5tXG2OZN0VteXq6fRo8pBUSpbkhmJMA/jr7COL3JwuUcSrhH6VnuotB9J5iWywM6bHEl/Od3sr4bGq6fQkVFklx6ybpLv90gVu1dgw6nAdpgyzmRChtlt01QMgpMKY29tfasfBoZkYWe5XCrEJ4DynWA/CxjFwcuB9XMPkcsvR4jAgAEwaqVxmLFQ0K25owwlJRxeJggz8sKsdqdfxjm/qRiHQESRmNpzP3NdJTXDBWzHQYIK5UEQVr3V6ELY9CgMKS+0tYKLROn98tcgGxkvcoq74gwzFPDMyp42bcSbZqFd8/sVPBo/bNPcugVTo4ejGnpo/Bf1Bt5RSZByZeaYsr746SWNSrvOPb8Ieh4qAcWNM47svYNq1cQFmfIrUc4xK09ARfz5y0OT7gdKLVe3Y1gYEHfWj0U3zeRnJE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(39860400002)(396003)(346002)(136003)(366004)(376002)(451199018)(31696002)(8936002)(6486002)(4326008)(66476007)(66946007)(66556008)(36756003)(8676002)(83380400001)(6916009)(41300700001)(86362001)(316002)(478600001)(2906002)(26005)(6512007)(186003)(31686004)(2616005)(38100700002)(5660300002)(6506007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z3F4U0xLM01oSWdTNWxsaVplK1FVVE50U3ZzV0ErcFlVMHhMbTl1OVpWM0lU?= =?utf-8?B?cFVoNDF0ZERwZWMrYVBmcHJXUjdqQ24wa1M3aUJyY2Nsb2lIZERhbVNHQ3Uz?= =?utf-8?B?SUI2eVlFNWxiWWVaR2haOEdoU2VTa1dneTEybk5sMXc1enlIZzQ2TGtub1Q3?= =?utf-8?B?Rkdqamk2emxUSFhscTNvS002YnJKVk92cmM3dVdWUmVZMTF5djQ1b1VSSnBI?= =?utf-8?B?U3YzRXJWT1lPSFdOeDZYRi9wTXFRUGR4RmJlV3I0SGRhNDlTQUwwRnM0UzdT?= =?utf-8?B?K29WZ25KcEI2NTFJam1SU0xwemR2MEJkTWRiYUdaUDRhdXBsVUZWU3cxYWUx?= =?utf-8?B?SWU5Rjh5bFRGRE03ZGQwUE1sVFJUNmw4bEhIMXlCMXVCekFMa1VZRkNhTUFn?= =?utf-8?B?UlVHZG13Q2VwTTJKMDRid0I3Mi90b0Q3ZVcxL2RBQkt3bzBvdllLNEpPTWo2?= =?utf-8?B?VTZ0cmV6MHh3WkphWjRzYUtVYlVsSzZiREpOKzQzK2tLa0xPTVBGT093czRH?= =?utf-8?B?TWk1NHlhTi9Nbi9oMGpxbHNWT0pwYjZsWjlpVGdZUHRYWlIvaC9EMU92SGtx?= =?utf-8?B?MkdsUzU5NHFNaG9BeXluTjFSaWFJVThQeEhkTy9aQWlZVERwMEY5aVpld1kr?= =?utf-8?B?eVJvQlh2TlZUa0lOT2wrNU1zdmZ0Tkp3UGxLZ1d3dC9Ealg4R0hQdVdzMW52?= =?utf-8?B?OVJoTTdLUlBsRXBHQ3JGemFCTDhHTEY1QkFacWFtMzV5T3prN2Q1emYrSVA0?= =?utf-8?B?RjJXd1Q2TXZCUU5HSW03U0JxcXgxS1c1VmR2RU5mKzQrZEZjVEoybENtRmgw?= =?utf-8?B?ME8rZjRoWHh1cFFOUjRaaDh5azhPZUlleDBJYmZMcWhRREVDeWt4NjZaREhR?= =?utf-8?B?MG5NaUQ5Umd3bHFPdHdQT0lxL25vdVVoaHRBMHFrK21zSzkxUjV2VE5XYm01?= =?utf-8?B?N25kdTVMeXB0Nkd3a0FSTVhha29JcXd0OXVOWTFnVHQzWHhpR1M5c25uMEEv?= =?utf-8?B?YlgzcnpZTGdOTlM2eGlRcW8vUzB0WFN3bjZRRDdFR0RKNE5xT2RnRlRsSTVV?= =?utf-8?B?RlBudDJpY2ZxYi8zUkY0QThBcmFoRkpRcHNqaUFIZk9pOHovUEFpNzRiSnJD?= =?utf-8?B?WjgzL053dzBMWlJiUUU4NVo1ald5ZkdEZTRZNjkydHoxUWxTNVlQR2VSWFRE?= =?utf-8?B?SERrbjgxcUM4NFZkMWlwR2lsd2phanFQanY4U0xpbG91NUxCbVBJcXRIa1la?= =?utf-8?B?ZE1TWlF0ZTdkWWhoR1Q4QjhMNXhuNWtzN0VWWnQ1MmJ6b0UwQ3JaTldDakM1?= =?utf-8?B?ZDZka2VWOHBBM3drK01HLzlWUFVsZGJZOUpQa3FkSUZ2ZldkUnNoSUM0WWR2?= =?utf-8?B?V2JPOGRrTHNRLy96SWViUFFKbncvd0xvVDljSlJ0Y01ncEZEaktRZk94OVNQ?= =?utf-8?B?MU9uaDhxZDhhUFRNMWtQYVM3c3lwWThEWWt0OUxIelZEakNHSjdGbmJzYjBv?= =?utf-8?B?UkRMaVdYSXBaVGtpVjZGck1mQU1lWDRaMEFUOEMzem0vM1VEbm1KOXY2Znd0?= =?utf-8?B?U2VDb0lKMjA4b0hWQTBxUGlGNVIra2ErLzRCOVZ6MUZSaTh4NVA5NDFxUU5O?= =?utf-8?B?TVhiMXFPV3hkbGJ6cnVqd0tyR1NHdUNBejM3ckwybGFqWWFSd3lQSHFJbGtM?= =?utf-8?B?TWZhV0pjVHlFVXNydWNDSUQxY0lZRnBVTWZ3UGxjQXZHUEtrQ1ZIcFdNdVQ5?= =?utf-8?B?U3dIL3hQaXRvTTZDMElEUGk3dnd1S2ltbkdaYWU0WWU1V0U0MGFGdjZrS2J0?= =?utf-8?B?c1BHMG4vcFFucWpYb1lMWGUwSXJvUk51Y3J1MkNLTmZwV1phSDFSQ3N6dndq?= =?utf-8?B?SFhpaHVNak9kamFDeUxEV0o2MWJTL3ByVDZDR0U5UWdJdk1yZlJYanI2OWF0?= =?utf-8?B?akMwZi9PUGJRU2p1WGpHM3pIYzVzVk9heFZOcEFjeVRPK1lETkhQODVJaXV3?= =?utf-8?B?VzZObDlURFE1VUVMcTFHamFNeXpnaktLVDl6MHlHY1FGekNxVFVWU0xIYjBa?= =?utf-8?B?dHh5MGQ0TTM2K2d5SG1lNjZXckJkdytOTkkyVGdXNldXOXVwYk0wUUlicTlO?= =?utf-8?Q?/AFpfsmA0G8ortULKYDzBwwlA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d940a82-aba1-4a36-8439-08db0ea39451 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:53:13.5604 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PsAKOCpbiJ9kvihBaE57x7Uylbmq+XhudjR2QIBMwjTJTmFo1KVhIBuHxeW/1V2CHHiAmlWoRN9Yec4QmYtnOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7834 X-Spam-Status: No, score=-3028.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 List-Id: In 7545aa2dd2eb ("gas: improve interaction between read_a_source_file() and s_linefile()") I didn't pay attention to the dual purpose of the nul character previously used. This was to a fair degree because of the open-coding of certain operations. Insert the earlier found line terminator instead of a hard-coded newline, and do so early in this special case (bypassing the later general insertion point). Plus properly use sb_terminate() to mark the end of the string. (Note that saved_eol_char was misnamed: Without calling sb_terminate() there's simply random data at that position in the buffer.) --- a/gas/macro.c +++ b/gas/macro.c @@ -263,13 +263,13 @@ buffer_and_nest (const char *from, const if (from != NULL && strcasecmp (from, "MACRO") == 0 && len >= 8 && strncasecmp (ptr->ptr + i, "linefile", 8) == 0) { - char saved_eol_char = ptr->ptr[ptr->len]; - - ptr->ptr[ptr->len] = '\n'; - temp_ilp (ptr->ptr + i + 8); + sb_add_char (ptr, more); + temp_ilp (sb_terminate (ptr) + i + 8); s_linefile (0); restore_ilp (); - ptr->ptr[ptr->len] = saved_eol_char; + line_start = ptr->len; + more = get_line (ptr); + continue; } }