diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2010-12-03 04:48:56 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2010-12-03 04:48:56 +0000 |
| commit | 2e3331995e674fd5b4e7d370ec3bad48e9d8e8f1 (patch) | |
| tree | c8721229a0c70ed62bda3f6f75cc67cdb2c88a37 | |
| parent | 7a9389330e91acc3ed05deac2d198af25d13cf3c (diff) | |
| download | gcc-2e3331995e674fd5b4e7d370ec3bad48e9d8e8f1.zip gcc-2e3331995e674fd5b4e7d370ec3bad48e9d8e8f1.tar.gz gcc-2e3331995e674fd5b4e7d370ec3bad48e9d8e8f1.tar.bz2 | |
gnatvsn.adb (Gnat_Version_String): Don't overrun Ver_Len_Max.
* gnatvsn.adb (Gnat_Version_String): Don't overrun Ver_Len_Max.
* gnatvsn.ads (Ver_Len_Max): Bump up to 256.
* g-comver.adb (Ver_Len_Max): Likewise.
From-SVN: r167408
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/g-comver.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/gnatvsn.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/gnatvsn.ads | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 853926c..01d2193 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2010-12-03 Alexandre Oliva <aoliva@redhat.com> + + * gnatvsn.adb (Gnat_Version_String): Don't overrun Ver_Len_Max. + * gnatvsn.ads (Ver_Len_Max): Bump up to 256. + * g-comver.adb (Ver_Len_Max): Likewise. + 2010-12-03 Laurynas Biveinis <laurynas.biveinis@gmail.com> * gcc-interface/decl.c (struct subst_pair_d): Remove GTY tag. diff --git a/gcc/ada/g-comver.adb b/gcc/ada/g-comver.adb index b71cadc..ac096f4 100644 --- a/gcc/ada/g-comver.adb +++ b/gcc/ada/g-comver.adb @@ -37,7 +37,7 @@ package body GNAT.Compiler_Version is - Ver_Len_Max : constant := 64; + Ver_Len_Max : constant := 256; -- This is logically a reference to Gnatvsn.Ver_Len_Max but we cannot -- import this directly since run-time units cannot WITH compiler units. diff --git a/gcc/ada/gnatvsn.adb b/gcc/ada/gnatvsn.adb index 34f72e7..6d76f7e 100644 --- a/gcc/ada/gnatvsn.adb +++ b/gcc/ada/gnatvsn.adb @@ -74,6 +74,8 @@ package body Gnatvsn is S (Pos + 1) := Version_String (Pos); Pos := Pos + 1; + + exit when Pos = Ver_Len_Max; end loop; return S (1 .. Pos); diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads index 4a3adc8..c73824e 100644 --- a/gcc/ada/gnatvsn.ads +++ b/gcc/ada/gnatvsn.ads @@ -70,7 +70,7 @@ package Gnatvsn is -- Return the name of the Copyright holder to be displayed by the different -- GNAT tools when switch --version is used. - Ver_Len_Max : constant := 64; + Ver_Len_Max : constant := 256; -- Longest possible length for Gnat_Version_String in this or any -- other version of GNAT. This is used by the binder to establish -- space to store any possible version string value for checks. This |