From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtphub1.cc.ic.ac.uk (smtphub1.cc.ic.ac.uk [IPv6:2a0c:5bc0:80:108::47]) by sourceware.org (Postfix) with ESMTPS id CB6AA3858C50; Thu, 4 Apr 2024 15:16:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB6AA3858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=imperial.ac.uk Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=imperial.ac.uk ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CB6AA3858C50 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=2a0c:5bc0:80:108::47 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712243822; cv=pass; b=C25Zrhm86dklVSr6r331iMYmNw8L0qcGnpFyoNJGlNJD/F3XJpDtgxg+n9+OTurRbLBj06azTLeynbYG8wbSEpd3vq7FtvLHaDS3cz5YYg41CYQ1wgZduy8RtmSCJC5FrAkUo9nLug6Bq5PC8BPa+SPcbJc8bEeJ8Y54zzIBK5k= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712243822; c=relaxed/simple; bh=+jgLkP4DVvKvHGQNAEgO6rFViLcPbiRZ0ulajQVzg+o=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=VWsOgmyFFZYv215rAqYRD9zAW4y2PImogRwntii7fSf0F0Xdy2jdgxna5bD/2jJNaymbYu34hpfdT6q+9DT5JX+hKg0sfY+zQPCQdZ8Tk+4idB6jn06jiknjJoSeg8FF10HTXxyRxN/9fiw4y60m/RvheogB+JWcUCiQxgu5rSg= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=imperial.ac.uk; s=main01; h=MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=IXlwIbkl8zN7U1VWLobduThFFc4Zd+jyT/6QN3E3F04=; b=I2Wq6WxGl5+FNW4e8D2mJkIGGF xNqc+GkIM2HmmcfQBfrO0MEBNrfYqE4FDi5zoBInSO8O6kF0bf+1QHBhoBfB6fHGsbN8emRTNlu75 4/mYriAt/QAiG9lvnRX0Zto34q5bfV1aCGXap2BBaiSQ8k40wuJ/EfzXsepc31R7G6dQ=; Received: from mail-cwxgbr01lp2040.outbound.protection.outlook.com ([104.47.85.40] helo=GBR01-CWX-obe.outbound.protection.outlook.com) by smtphub1.cc.ic.ac.uk with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rsOpn-0001YP-0x; Thu, 04 Apr 2024 16:16:59 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dY8dhYaCz9L596ABssfDz4i39xPWun62Vof2wItRsbzDFyBosFCQDigj4Pb1sls5x178t8xmgM5ciHTL8ZmSJndUMNp68h1Up0B1drSb9+IvT6nPo30lo7S7bNLXiujzSYFgTU4rzbySyiv+RRBoPV5QG6ETETSty62LsU+xtZf5EM5qc3tY2jaY7Funn/pZ6iTHM3W0t5Sgi7EkSOsy3bLlE53NRKqhtbYNYCjvJy0RydQVXf9YLTHS8u/NhF8vXdqGaCEFGakZVoRwcWuHeMfuH8tzEYYNE+XBJaeCDecL+0X133xOrZ6mRrkBMItFGnTLEBel/sMcBO3aA+3dIA== 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=IXlwIbkl8zN7U1VWLobduThFFc4Zd+jyT/6QN3E3F04=; b=fYqb+ewMQCoCDx9Wa80TOyP9a/YNXV1qTewe4VAYUI+/j6LOiDIJr67PaM7w0laZLYp+gXGDQdfaQIn+/gaEBWOsRJ5bESbgnJMJBwjSswNQnInckOCftaCchJaXdxQT0B5le8q60hrxCUlNPE0411X9PUGy/7iDgM6Ro6/kmRRPrsypgufLD9fwkF3rDBoxBqzp5PdxIAz9CrR21LdCsRc0rJfoQPMOkynQicFDcUD+UOPkvrzMlEcYBErJv883FqiQYBaSG2++BiwTP1Kb1BqNt3YOaR1mXHgH/AtNAZkx8Xfyea3/PJjloSZRjG9CwHER+wKFO+/tzamXUc++8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=imperial.ac.uk; dmarc=pass action=none header.from=imperial.ac.uk; dkim=pass header.d=imperial.ac.uk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ImperialLondon.onmicrosoft.com; s=selector2-ImperialLondon-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IXlwIbkl8zN7U1VWLobduThFFc4Zd+jyT/6QN3E3F04=; b=nYjMiCx+wazQLkiVXU2GPmu3jN6o53503AIsiqVuFecWwvt+E6vElrmysn81P5WW8fggF/kBA61C+PHvZSI22J8wcecoTXvQvYS5WQFOagoZbyC8lYZ7Fw/M80fop3ZkkFY1xGVsCmOWoLuh3sLRR3j3Z4xi/FOKBYcWmqRDP18= Received: from LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:1ea::12) by LOYP265MB1805.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 15:16:58 +0000 Received: from LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM ([fe80::be6f:a150:b84:d826]) by LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM ([fe80::be6f:a150:b84:d826%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 15:16:58 +0000 From: Ian McInerney To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Ian McInerney Subject: [PATCH 1/1] libgfortran: Fix compilation of gf_vsnprintf Date: Thu, 4 Apr 2024 16:16:32 +0100 Message-ID: <20240404151632.3026631-2-i.mcinerney17@imperial.ac.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404151632.3026631-1-i.mcinerney17@imperial.ac.uk> References: <20240404151632.3026631-1-i.mcinerney17@imperial.ac.uk> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO2P265CA0493.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:13a::18) To LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:1ea::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LO2P265MB4117:EE_|LOYP265MB1805:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MG1uz5pyTykPUNqltzZFn3A0NpRKioOvhmmjn1O+592SrsgjXeuuzNbsVvQp+Ve09VmEgWRpvc5b0r76YVQ/TJN5BIZzSRShkMibalJXQaP4oHc50FtnC/TMxpbXVwVSei5Iew8bK6cla/4ArZXUEcseY8RQXWRgPMI69ZGyMFfELc2DKVxsYmmTtLbHL4O+7xRMeoE5ShHAZEsS+kZSOKvcqA1tcWn04lwHnOv0aEIVqtOD+ietqP5GoaC0pt+iO4T+qM6xhE3L9ceOdbZFWlug/8CX+FkJD9WXUGntr/V0nTjUUjOgrETpLBojoDUAxvRfuv/GhaIa3ffFjgXym0qaC4ds7RtklK+MeUmaF3cNfg6xfqOtToj6QnCFQEqibEeccYDiGesAt++8smyXVxu9J0ErUpvBae20TTaGRL46FIqHoxoS2Ifv1eVFjskp3wmT3jYTt08IAHsQ6MlY/Z6Meprxh289HtiuaO3rZgO37wdOVbXJHNx87Jv5uwLYkjQq/OlvQiJ8ppWXNPU8HkAySIDKq4k+CP6yo/wYkkZvtUMUVuxv4Xfy4YGhGbYcrJjC6jihdh4YqrjxdfAXq+mnd2OieaQ3WGtbss6Fgle1GrEII5/FPAwVAO58maHWel4LaisLLW5lBQKzyjp/6QtYnsNJJ+0xLsozi10aBigSKLc03PbD/63BTebagJ4Rp4k833uFDAxP1JqIZ/duPgF41QNmhwssGS4JhPvkUZI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ShNV0wMRu6K0ZTWYoi6bDbc1Opnwdk0CYZYieTr54/kMvX28ubiXm113Cp6C?= =?us-ascii?Q?taiI3+itAlR2fhfv5WWIxD+lhc0mMGfCv4jyggiSmoDu4bJttUwPW9gJcBtk?= =?us-ascii?Q?biFraSKLZ0zd1EOdHK5JxkSaftElE0D9xVGj600tsxMRvAr1ScBDQ36mxxsu?= =?us-ascii?Q?FBuqvot5UlsXT4YdtZYRSXnLbvsbi8U6ZvmiiTYXKvXCY8YhqoSpMCbLKkpw?= =?us-ascii?Q?+wTfUgz7oEeHmz8c9cXNRoRZLF5x4qeHOFf3b0oLeNe0yKDu+VNB2txRR9VH?= =?us-ascii?Q?cPaflI9yxg4nhFYiTSbJfORz8VlVO9lHiZP8cU3/5r3/EvHsKOQ+CVJiV77X?= =?us-ascii?Q?9+Q/j6Zn0Gi5eWnPopxdtvJB2sT6H98SxpeIqkpjMf40Ylx0LUWpO378/pb0?= =?us-ascii?Q?5UUsjkI+l0hafm7nZFq8ck93NUwpg9ZQk9Jula41k6E2Wsxvyh5KWhngZ30p?= =?us-ascii?Q?XGl4gd3aXznP9D6wQrC/SD5S1AmljYHVa+w8im4ZQqVEttz2/VbQszcnmL8g?= =?us-ascii?Q?UGxkfymY6hDJXhKmMU8UKC6EZNoGUY8aq+XUGZf6Q38psQOi/h38rve0T/26?= =?us-ascii?Q?fdwJ2VPhusJ6At/DUKV3ML/OwMU7jiTCALGfWAajUnXP+Y49tPVjpUXdXG2T?= =?us-ascii?Q?T+ORdrnhj3uBX5rnKtWaP3rY/DOlo+DkucvKcwS7qGYWXaqCjsPutTfERVI1?= =?us-ascii?Q?B4hZxW5U0hH8UhFgFQPs2wZ1voKd7ZW8i7WmgydLqIeT0tqmukv4/HkXL3O/?= =?us-ascii?Q?SheguyhM55YrcnFGPkwtarjoQVERJreVV7SEHS0HI1KSZsymy5bQ6jGdytQA?= =?us-ascii?Q?ajjQ8tvW8CRvmIKu385Viv4FTn2SixQAWaTIgFgqmWd183Zvfm6hwkXkkO2A?= =?us-ascii?Q?Z/VT3Px9pp5FMPD63LFWZnbrR480f2pDgR6NguIAQ7D1yMe02kkf34x7787t?= =?us-ascii?Q?gyteKJuHwl3C3BGOcr3anB226cJLiheQ1cwo+JWQyshgYEMAKDLWwn2SKPoA?= =?us-ascii?Q?yTUY+ZYBaDlrb13LXMmBmvwpqTJKVL5pBdefvhyRmmrOpvZEGcHVRpKFcvey?= =?us-ascii?Q?sBpWTjKwwg7d/9tuk2dAz15MV0am3oz2hJubyMqckawl3A2QaGypyNi/SQLv?= =?us-ascii?Q?csQnBiv/pGKMHcoDv0t5bFPd+cdVCKm9INQkTD+kMo7uXxL8w3nptP/6Rkqk?= =?us-ascii?Q?jJfn+lwDGkbdSlosCr/AJb9mKzM4FIcoXDGRzr7/bfOVCg4XKWq+5y52JFUv?= =?us-ascii?Q?83Ld6a4StbNtBb6C4tz464RFFrUXfwooebWVvX6Pd1JPTj9tvkZ7kJqgxYvK?= =?us-ascii?Q?8q2ykrpGSgtXokS3OP8nwPfF2WmIy9Djy+kIDogQxA56pKyfOw/GKjNN3tWx?= =?us-ascii?Q?sN+Smy6HWhzzk5JJMj9+dSsOK924LRAYYIhYWQvsP35um8oykUSpVUr9JTGG?= =?us-ascii?Q?fuYFqF66d/ecnx5CmNMgbGfQwBJnCdbmjPRipHpmys98obxn+n7emBOXcj4I?= =?us-ascii?Q?ijbZacC86Ypu1ysztKVi44wH9s7yFSh4cNJ+QJm+atnaZs7jOotRwGgaoynX?= =?us-ascii?Q?gbyrOqx7+ayPa6C4BQXmU+h63bWf8ns7vvJAPCZH?= X-OriginatorOrg: imperial.ac.uk X-MS-Exchange-CrossTenant-Network-Message-Id: 63bc4974-8042-47ef-cb53-08dc54ba4524 X-MS-Exchange-CrossTenant-AuthSource: LO2P265MB4117.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 15:16:58.1584 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b897507-ee8c-4575-830b-4f8267c3d307 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AcBHLcnE4CSZGPH3sd8X+Nka/v0uqMitaSqaN0TKeeK6oDn1UPWtEcGxZ86SUg8a X-MS-Exchange-Transport-CrossTenantHeadersStamped: LOYP265MB1805 X-IC-MsgID: 1rsOpn-0001YP-0x X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: The fallback function (gf_vsnprintf) to provide a vsnprintf function if the system library doesn't have one would not compile due to the variable name for the string's destination buffer not being updated after the refactor in 2018 in edaaef601d0d6d263fba87b42d6d04c99dd23dba. This updates the internal logic of gf_vsnprintf to now use the str variable defined in the function signature. libgfortran/ChangeLog: 2024-04-04 Ian McInerney * runtime/error.c (gf_vsnprintf): Fix compilation Signed off by: Ian McInerney --- libgfortran/runtime/error.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c index e840f539599..044298294d8 100644 --- a/libgfortran/runtime/error.c +++ b/libgfortran/runtime/error.c @@ -142,15 +142,15 @@ gf_vsnprintf (char *str, size_t size, const char *format, va_list ap) { int written; - written = vsprintf(buffer, format, ap); + written = vsprintf(str, format, ap); if (written >= size - 1) { - /* The error message was longer than our buffer. Ouch. Because + /* The error message was longer than the string size. Ouch. Because we may have messed up things badly, report the error and quit. */ -#define ERROR_MESSAGE "Internal error: buffer overrun in gf_vsnprintf()\n" - write (STDERR_FILENO, buffer, size - 1); +#define ERROR_MESSAGE "Internal error: string overrun in gf_vsnprintf()\n" + write (STDERR_FILENO, str, size - 1); write (STDERR_FILENO, ERROR_MESSAGE, strlen (ERROR_MESSAGE)); sys_abort (); #undef ERROR_MESSAGE -- 2.43.0