From patchwork Tue Jan 9 13:15:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 1884446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=SsHs1rIt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8Wf52w59z1yP3 for ; Wed, 10 Jan 2024 00:16:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 482FC3861821 for ; Tue, 9 Jan 2024 13:16:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 764FC386102F for ; Tue, 9 Jan 2024 13:15:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 764FC386102F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 764FC386102F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::331 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704806136; cv=none; b=vdUAPgX/TxYj++fgk/o8jmjt+Hwzbqt+dbgmi3UTEze4xZzYFTDFFo1egZ9cckBUYJq4O1q7UNB93B0OH0xNMIi3My/8aiOghxrwKQ6+Vz0qTs4WiZy4EStEzJwZMWnSMgR/6ZOPaq/3kP8r321UM4y5YcbxbJgDXtQC2hvaCOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704806136; c=relaxed/simple; bh=2DHRxZR2F8d71ixF2X/JMBNk9SLlXIJrVk7n+uW+bRo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=NBImRvN1zQxf6M5O09yLQR1v6Ha2pxj+8bVd5M/a/WBasyK/EBbIJtc6iIRlgsBV5nC8NwAAGXrG7/VGFZ2icyjr9Tb3cHxWf6s0K4n97KIO4XrS8w0h3aH6UPdMR626frZlB9acEhJepxq+82/1yF46MxMYj3ipP3D7n7U7j08= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40e4d64a3d8so10832015e9.0 for ; Tue, 09 Jan 2024 05:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1704806133; x=1705410933; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6So1mm3T5svxvSIgivlaumANUmbOO3bEn6I81juaIz0=; b=SsHs1rIt6VlNLD9155ZFwvhkgR/dIL0oiV2c1NUiWwkufGbf1/SQthRFJkTg4QXFv/ JVfxU8Q4A7YbMhlQGHIIBKsKHhlcqWkV9vEOqZ02crJxufpG8DkGF5s+aqeZwg3dFiEz faSuzDitbOdQCDxkViB8knYp1HHuzhlMUoGzQbkrwGqEaum60dQjLdv4g+McZAamd4ny rejbN6yiBEpPRDtiiwToe8J2WyRE9KJEE1+i1vzxSYjO2F4JteF476UrlP0YI5zuSyUV ZUrBdORqd4PrDH9nGg15xPTMWtVtmCy7GOqd7+DqhH1RHEpYdKULcPPZirq5+3e5o4EY XwMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704806133; x=1705410933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6So1mm3T5svxvSIgivlaumANUmbOO3bEn6I81juaIz0=; b=WPF7Dd1ecACqDqMmJVpatIgi1MRnU89IysmpCl0amlHMwy/lhRIAIlaqjeqkj+c9fR beJ6BYi6JEQi8IvuIPGJZsU9jvqBEs4KJxhuOPQY7Qp2zyARKAkvVACoT6eqXF3g6RE1 X800kPMUSBfTnO3NMXKBMxQ5gqmBOFybxaF2pr0glVVBRs5rFDs7jN5ND8i903/CWi9t 3A6pykagq5RmC8vktOLIE1R8N4Z4Aw3efE5uFtB9G99hi2i8BTTPSGIo+xVUE4FgTbgx F8KhpkjyOsGNjtpbqJNLi+NygF7aAqFxCUPH8MLmRgclETvkf/0/hzJJgctPcN8yAWZR 8m8w== X-Gm-Message-State: AOJu0Yy18o45vCST3TXdiYzd00yac984E3c795EK8tt06NhJA7Tf7Hoj wM9t+AGFPXzDuXJpKbSWRXfHy13Od9hgnGeXRYICWghpTg== X-Google-Smtp-Source: AGHT+IFLM34BpYuet/cRxT8Ohnj92GfhBG56e+0jPPI0pikuBat6krIchQ5gpAFwMx4WspXkLWefFA== X-Received: by 2002:a05:600c:3ac9:b0:40e:46d9:cb60 with SMTP id d9-20020a05600c3ac900b0040e46d9cb60mr1698534wms.62.1704806133319; Tue, 09 Jan 2024 05:15:33 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id z11-20020a05600c0a0b00b0040d772030c2sm3578506wmp.44.2024.01.09.05.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 05:15:32 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Joffrey Huguet Subject: [COMMITTED] ada: Fix precondition in Interfaces.C.Strings Date: Tue, 9 Jan 2024 14:15:32 +0100 Message-ID: <20240109131532.743911-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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, T_SCC_BODY_TEXT_LINE 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Joffrey Huguet The precondition of both Update procedures in Interfaces.C.Strings were incorrect. This patch fixes this. gcc/ada/ * libgnat/i-cstrin.ads (Update): Fix precondition. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/i-cstrin.ads | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/ada/libgnat/i-cstrin.ads b/gcc/ada/libgnat/i-cstrin.ads index 9f1577f5e14..3f55ddfbdc5 100644 --- a/gcc/ada/libgnat/i-cstrin.ads +++ b/gcc/ada/libgnat/i-cstrin.ads @@ -121,8 +121,9 @@ is with Pre => Item /= Null_Ptr - and then Strlen (Item) <= size_t'Last - Offset - and then Strlen (Item) + Offset <= Chars'Length, + and then (Chars'First /= 0 or else Chars'Last /= size_t'Last) + and then Chars'Length <= size_t'Last - Offset + and then Chars'Length + Offset <= Strlen (Item), Global => (In_Out => C_Memory); procedure Update @@ -133,8 +134,8 @@ is with Pre => Item /= Null_Ptr - and then Strlen (Item) <= size_t'Last - Offset - and then Strlen (Item) + Offset <= Str'Length, + and then Str'Length <= size_t'Last - Offset + and then Str'Length + Offset <= Strlen (Item), Global => (In_Out => C_Memory); Update_Error : exception;