Merge pull request #4466 from ScriptDevil/master

Range checking and miscellaneous fixes tin time library

Author: catamorphism

src/libstd/time.rs

@@ -341,6 +341,16 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
         Some((value, pos))
     }
 
+    fn match_digits_in_range(ss: &str, pos: uint, digits: uint, ws: bool,
+                             min: i32, max: i32) -> Option<(i32, uint)> {
+        match match_digits(ss, pos, digits, ws) {
+          Some((val, pos)) if val >= min && val <= max => {
+            Some((val, pos))
+          }
+          _ => None
+        }
+    }
+
     fn parse_char(s: &str, pos: uint, c: char) -> Result<uint, ~str> {
         let range = str::char_range_at(s, pos);
 
@@ -414,7 +424,8 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
             Some(item) => { let (v, pos) = item; tm.tm_mon = v; Ok(pos) }
             None => Err(~"Invalid month")
           },
-          'C' => match match_digits(s, pos, 2u, false) {
+          'C' => match match_digits_in_range(s, pos, 2u, false, 0_i32,
+                                             99_i32) {
             Some(item) => {
                 let (v, pos) = item;
                   tm.tm_year += (v * 100_i32) - 1900_i32;
@@ -440,11 +451,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 .chain(|pos| parse_char(s, pos, '/'))
                 .chain(|pos| parse_type(s, pos, 'y', &mut *tm))
           }
-          'd' => match match_digits(s, pos, 2u, false) {
+          'd' => match match_digits_in_range(s, pos, 2u, false, 1_i32,
+                                             31_i32) {
             Some(item) => { let (v, pos) = item; tm.tm_mday = v; Ok(pos) }
             None => Err(~"Invalid day of the month")
           },
-          'e' => match match_digits(s, pos, 2u, true) {
+          'e' => match match_digits_in_range(s, pos, 2u, true, 1_i32,
+                                             31_i32) {
             Some(item) => { let (v, pos) = item; tm.tm_mday = v; Ok(pos) }
             None => Err(~"Invalid day of the month")
           },
@@ -456,15 +469,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 .chain(|pos| parse_type(s, pos, 'd', &mut *tm))
           }
           'H' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 0_i32, 23_i32) {
               Some(item) => { let (v, pos) = item; tm.tm_hour = v; Ok(pos) }
               None => Err(~"Invalid hour")
             }
           }
           'I' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 1_i32, 12_i32) {
               Some(item) => {
                   let (v, pos) = item;
                   tm.tm_hour = if v == 12_i32 { 0_i32 } else { v };
@@ -474,26 +485,23 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
             }
           }
           'j' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 3u, false) {
+            match match_digits_in_range(s, pos, 3u, false, 1_i32, 366_i32) {
               Some(item) => {
                 let (v, pos) = item;
                 tm.tm_yday = v - 1_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid year")
+              None => Err(~"Invalid day of year")
             }
           }
           'k' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, true) {
+            match match_digits_in_range(s, pos, 2u, true, 0_i32, 23_i32) {
               Some(item) => { let (v, pos) = item; tm.tm_hour = v; Ok(pos) }
               None => Err(~"Invalid hour")
             }
           }
           'l' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, true) {
+            match match_digits_in_range(s, pos, 2u, true, 1_i32, 12_i32) {
               Some(item) => {
                   let (v, pos) = item;
                   tm.tm_hour = if v == 12_i32 { 0_i32 } else { v };
@@ -503,15 +511,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
             }
           }
           'M' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 0_i32, 59_i32) {
               Some(item) => { let (v, pos) = item; tm.tm_min = v; Ok(pos) }
               None => Err(~"Invalid minute")
             }
           }
           'm' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 1_i32, 12_i32) {
               Some(item) => {
                 let (v, pos) = item;
                 tm.tm_mon = v - 1_i32;
@@ -548,8 +554,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 .chain(|pos| parse_type(s, pos, 'p', &mut *tm))
           }
           'S' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 0_i32, 60_i32) {
               Some(item) => {
                 let (v, pos) = item;
                 tm.tm_sec = v;
@@ -568,14 +573,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
           }
           't' => parse_char(s, pos, '\t'),
           'u' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 1u, false) {
+            match match_digits_in_range(s, pos, 1u, false, 1_i32, 7_i32) {
               Some(item) => {
                 let (v, pos) = item;
-                tm.tm_wday = v;
+                tm.tm_wday = v-1_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid day of week")
             }
           }
           'v' => {
@@ -587,34 +591,31 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
           }
           //'W' {}
           'w' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 1u, false) {
+            match match_digits_in_range(s, pos, 1u, false, 0_i32, 6_i32) {
               Some(item) => { let (v, pos) = item; tm.tm_wday = v; Ok(pos) }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid day of week")
             }
           }
           //'X' {}
           //'x' {}
           'Y' => {
-            // FIXME (#2350): range check.
             match match_digits(s, pos, 4u, false) {
               Some(item) => {
                 let (v, pos) = item;
                 tm.tm_year = v - 1900_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid year")
             }
           }
           'y' => {
-            // FIXME (#2350): range check.
-            match match_digits(s, pos, 2u, false) {
+            match match_digits_in_range(s, pos, 2u, false, 0_i32, 99_i32) {
               Some(item) => {
                 let (v, pos) = item;
-                tm.tm_year = v - 1900_i32;
+                tm.tm_year = v;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid year")
             }
           }
           'Z' => {