public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-938] [Ada] Fix preconditions of Interfaces.C.Strings
@ 2022-06-02  9:09 Pierre-Marie de Rodat
  0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-06-02  9:09 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:cfd2262668862167cbe102ffbe87f127599be7a8

commit r13-938-gcfd2262668862167cbe102ffbe87f127599be7a8
Author: Joffrey Huguet <huguet@adacore.com>
Date:   Thu May 12 11:53:54 2022 +0200

    [Ada] Fix preconditions of Interfaces.C.Strings
    
    Preconditions of Update procedures were always true when Offset was 0.
    The changes enable to protect from Update_Error when Offset is 0.
    
    gcc/ada/
    
            * libgnat/i-cstrin.ads (Update): Update precondition.

Diff:
---
 gcc/ada/libgnat/i-cstrin.ads | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/ada/libgnat/i-cstrin.ads b/gcc/ada/libgnat/i-cstrin.ads
index faad7a0b73b..12fa3012ff0 100644
--- 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:09 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:09 [gcc r13-938] [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).