diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2006-02-15 10:32:25 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2006-02-15 10:32:25 +0100 |
| commit | ee45a6dda7e4170ad4ff320239f340a5ce17275a (patch) | |
| tree | b2c80f9b972763c47d1781393bcc7b3fcafa9747 | |
| parent | 68e2ea275783d8b96d51913913fe88b4f61ee0c9 (diff) | |
| download | gcc-ee45a6dda7e4170ad4ff320239f340a5ce17275a.zip gcc-ee45a6dda7e4170ad4ff320239f340a5ce17275a.tar.gz gcc-ee45a6dda7e4170ad4ff320239f340a5ce17275a.tar.bz2 | |
a-stwisu.adb, [...] (Super_Slice): Fix slice index.
* a-stwisu.adb, a-strsup.adb, a-stzsup.adb (Super_Slice): Fix slice
index.
* a-stwima.adb (To_Set): Add extra check when N = 0.
* g-regpat.adb: (Match_Simple_Operator): Avoid possible overflow.
From-SVN: r111033
| -rw-r--r-- | gcc/ada/a-strsup.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/a-stwisu.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/a-stzsup.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/g-regpat.adb | 14 |
4 files changed, 17 insertions, 15 deletions
diff --git a/gcc/ada/a-strsup.adb b/gcc/ada/a-strsup.adb index 1b1c909..a53a94d 100644 --- a/gcc/ada/a-strsup.adb +++ b/gcc/ada/a-strsup.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2003-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 2003-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1471,7 +1471,7 @@ package body Ada.Strings.Superbounded is raise Index_Error; else Result.Current_Length := High - Low + 1; - Result.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Result.Data (1 .. Result.Current_Length) := Source.Data (Low .. High); end if; return Result; @@ -1490,7 +1490,7 @@ package body Ada.Strings.Superbounded is raise Index_Error; else Target.Current_Length := High - Low + 1; - Target.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Target.Data (1 .. Target.Current_Length) := Source.Data (Low .. High); end if; end Super_Slice; diff --git a/gcc/ada/a-stwisu.adb b/gcc/ada/a-stwisu.adb index 5984e5e..ad15f3d 100644 --- a/gcc/ada/a-stwisu.adb +++ b/gcc/ada/a-stwisu.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2003-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 2003-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1474,7 +1474,7 @@ package body Ada.Strings.Wide_Superbounded is raise Index_Error; else Result.Current_Length := High - Low + 1; - Result.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Result.Data (1 .. Result.Current_Length) := Source.Data (Low .. High); end if; return Result; @@ -1493,7 +1493,7 @@ package body Ada.Strings.Wide_Superbounded is raise Index_Error; else Target.Current_Length := High - Low + 1; - Target.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Target.Data (1 .. Target.Current_Length) := Source.Data (Low .. High); end if; end Super_Slice; diff --git a/gcc/ada/a-stzsup.adb b/gcc/ada/a-stzsup.adb index 9e4fbcd..6b8e710 100644 --- a/gcc/ada/a-stzsup.adb +++ b/gcc/ada/a-stzsup.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2003-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 2003-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1481,7 +1481,7 @@ package body Ada.Strings.Wide_Wide_Superbounded is raise Index_Error; else Result.Current_Length := High - Low + 1; - Result.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Result.Data (1 .. Result.Current_Length) := Source.Data (Low .. High); end if; return Result; @@ -1500,7 +1500,7 @@ package body Ada.Strings.Wide_Wide_Superbounded is raise Index_Error; else Target.Current_Length := High - Low + 1; - Target.Data (1 .. Source.Current_Length) := Source.Data (Low .. High); + Target.Data (1 .. Target.Current_Length) := Source.Data (Low .. High); end if; end Super_Slice; diff --git a/gcc/ada/g-regpat.adb b/gcc/ada/g-regpat.adb index c52b5f2..6bfc2d9 100644 --- a/gcc/ada/g-regpat.adb +++ b/gcc/ada/g-regpat.adb @@ -7,7 +7,7 @@ -- B o d y -- -- -- -- Copyright (C) 1986 by University of Toronto. -- --- Copyright (C) 1999-2005, AdaCore -- +-- Copyright (C) 1999-2006, AdaCore -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -2878,12 +2878,14 @@ package body GNAT.Regpat is if Next_Char_Known then -- Last position to check - Last_Pos := Input_Pos + Max; - - if Last_Pos > Last_In_Data - or else Max = Natural'Last - then + if Max = Natural'Last then Last_Pos := Last_In_Data; + else + Last_Pos := Input_Pos + Max; + + if Last_Pos > Last_In_Data then + Last_Pos := Last_In_Data; + end if; end if; -- Look for the first possible opportunity |