diff options
author | Liaiss Merzougue <merzougue@adacore.com> | 2021-04-02 09:29:03 +0000 |
---|---|---|
committer | Marc Poulhiès <poulhies@adacore.com> | 2022-12-06 14:58:47 +0100 |
commit | c690f116b64be820cd47a554bffeadd9907fed2a (patch) | |
tree | aaae5513794d031e8c3b754b8bcbb8565c971ce7 /gcc | |
parent | ed34c3bc3428bce663d42e9eeda10bc0c5d56d5c (diff) | |
download | gcc-c690f116b64be820cd47a554bffeadd9907fed2a.zip gcc-c690f116b64be820cd47a554bffeadd9907fed2a.tar.gz gcc-c690f116b64be820cd47a554bffeadd9907fed2a.tar.bz2 |
ada: Add Codepeer Exemption + simplify TO_C code.
This patch simplify the TO_C code to have a single branch for
raising exception. Furthermore, adding pragma annotate for codepeer
to ignore uninitialized value since this is caused because we have
input check before the initialization.
gcc/ada/
* libgnat/i-c.adb (To_C): Simplify code for having a single
exception raise. Add pragma annotate about uninitialized value
which happen only on exception raising.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/libgnat/i-c.adb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gcc/ada/libgnat/i-c.adb b/gcc/ada/libgnat/i-c.adb index 4b50d18..2866021 100644 --- a/gcc/ada/libgnat/i-c.adb +++ b/gcc/ada/libgnat/i-c.adb @@ -186,7 +186,7 @@ is (Item : char_array; Trim_Nul : Boolean := True) return String is - Count : Natural; + Count : Natural := 0; From : size_t; begin @@ -1177,7 +1177,7 @@ is To : size_t; begin - if Target'Length < Item'Length then + if Target'Length < Item'Length + (if Append_Nul then 1 else 0) then raise Constraint_Error; else @@ -1210,17 +1210,14 @@ is Target'First + (Item'Length - 1))'Initialized); if Append_Nul then - if To > Target'Last then - raise Constraint_Error; - else - Target (To) := char32_nul; - Count := Item'Length + 1; - end if; - + Target (To) := char32_nul; + Count := Item'Length + 1; else Count := Item'Length; end if; end if; end To_C; + pragma Annotate (CodePeer, False_Positive, "validity check", + "Count is only uninitialized on abnormal return."); end Interfaces.C; |