Skip to content

R
riscv-gcc-1
Commit ee45a6dd by Arnaud Charlet
Options

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
parent 68e2ea27
Showing with 17 additions and 15 deletions
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;
......
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;
......
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;
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment