From: Pierre-Marie de Rodat <derodat@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Joffrey Huguet <huguet@adacore.com>
Subject: [Ada] Fix preconditions of Interfaces.C.Strings
Date: Thu, 2 Jun 2022 09:08:53 +0000 [thread overview]
Message-ID: <20220602090853.GA1010629@adacore.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
Preconditions of Update procedures were always true when Offset was 0.
The changes enable to protect from Update_Error when Offset is 0.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* libgnat/i-cstrin.ads (Update): Update precondition.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 872 bytes --]
diff --git a/gcc/ada/libgnat/i-cstrin.ads b/gcc/ada/libgnat/i-cstrin.ads
--- a/gcc/ada/libgnat/i-cstrin.ads
+++ b/gcc/ada/libgnat/i-cstrin.ads
@@ -120,7 +120,10 @@ is
with
Pre =>
Item /= Null_Ptr
- and then (if Check then Offset <= Strlen (Item) - Chars'Length),
+ and then
+ (if Check then
+ Strlen (Item) <= size_t'Last - Offset
+ and then Strlen (Item) + Offset <= Chars'Length),
Global => (In_Out => C_Memory);
procedure Update
@@ -131,7 +134,10 @@ is
with
Pre =>
Item /= Null_Ptr
- and then (if Check then Offset <= Strlen (Item) - Str'Length),
+ and then
+ (if Check then
+ Strlen (Item) <= size_t'Last - Offset
+ and then Strlen (Item) + Offset <= Str'Length),
Global => (In_Out => C_Memory);
Update_Error : exception;
reply other threads:[~2022-06-02 9:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220602090853.GA1010629@adacore.com \
--to=derodat@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=huguet@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).