diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-06 10:28:45 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-06 10:28:45 +0000 |
| commit | a8c5d8a91f507edc9b92b208950ce0e7448a2c1a (patch) | |
| tree | 26815fd1d08bb4d694ccbb28dc36830707549b12 /gcc | |
| parent | fbcd857d38d31702a4958d958b19ed4b4c6c60e2 (diff) | |
| download | gcc-a8c5d8a91f507edc9b92b208950ce0e7448a2c1a.tar.gz | |
2007-04-20 Robert Dewar <dewar@adacore.com>
* g-catiio.ads, g-catiio.adb (Image): Check for null picture string
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125413 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/g-catiio.adb | 35 | ||||
| -rw-r--r-- | gcc/ada/g-catiio.ads | 4 |
2 files changed, 28 insertions, 11 deletions
diff --git a/gcc/ada/g-catiio.adb b/gcc/ada/g-catiio.adb index 585caea721d..f0174d5266a 100644 --- a/gcc/ada/g-catiio.adb +++ b/gcc/ada/g-catiio.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1999-2006, AdaCore -- +-- Copyright (C) 1999-2007, 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- -- @@ -202,19 +202,32 @@ package body GNAT.Calendar.Time_IO is Second : Second_Number; Sub_Second : Second_Duration; - P : Positive := Picture'First; + P : Positive; begin + -- Get current time in split format + Split (Date, Year, Month, Day, Hour, Minute, Second, Sub_Second); - loop + -- Null picture string is error + + if Picture = "" then + raise Picture_Error with "null picture string"; + end if; + + -- Loop through characters of picture string, building result + + Result := Null_Unbounded_String; + P := Picture'First; + while P <= Picture'Last loop + -- A directive has the following format "%[-_]." if Picture (P) = '%' then Padding := Zero; if P = Picture'Last then - raise Picture_Error; + raise Picture_Error with "picture string ends with '%"; end if; -- Check for GNU extension to change the padding @@ -222,13 +235,14 @@ package body GNAT.Calendar.Time_IO is if Picture (P + 1) = '-' then Padding := None; P := P + 1; + elsif Picture (P + 1) = '_' then Padding := Space; P := P + 1; end if; if P = Picture'Last then - raise Picture_Error; + raise Picture_Error with "picture string ends with '- or '_"; end if; case Picture (P + 1) is @@ -462,18 +476,21 @@ package body GNAT.Calendar.Time_IO is Result := Result & Image (Year, None, 4); when others => - raise Picture_Error; + raise Picture_Error with + "unknown format character in picture string"; + end case; + -- Skip past % and format character + P := P + 2; + -- Character other than % is copied into the result + else Result := Result & Picture (P); P := P + 1; end if; - - exit when P > Picture'Last; - end loop; return To_String (Result); diff --git a/gcc/ada/g-catiio.ads b/gcc/ada/g-catiio.ads index 0ed4f5e6e1f..48abe6a14d4 100644 --- a/gcc/ada/g-catiio.ads +++ b/gcc/ada/g-catiio.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1999-2006, AdaCore -- +-- Copyright (C) 1999-2007, 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- -- @@ -114,7 +114,7 @@ package GNAT.Calendar.Time_IO is (Date : Ada.Calendar.Time; Picture : Picture_String) return String; -- Return Date as a string with format Picture. Raise Picture_Error if - -- picture string is wrong. + -- picture string is null or has an incorrect format. function Value (Date : String) return Ada.Calendar.Time; -- Parse the string Date and return its equivalent as a Time value. The |