* [Ada] Fix preconditions of Interfaces.C.Strings
@ 2022-06-02 9:08 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-06-02 9:08 UTC (permalink / raw)
To: gcc-patches; +Cc: Joffrey Huguet
[-- 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-02 9:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 9:08 [Ada] Fix preconditions of Interfaces.C.Strings Pierre-Marie de Rodat
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).