mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

time: fix and cleanup int validity checks (#18885)

Browse Source
This commit is contained in:
Turiiya
2023-07-17 21:24:52 +02:00
committed by GitHub
parent 8c8d21d130
commit 2eea59c4cc
2 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/time/parse.c.v
View File

@ -3,6 +3,8 @@
// that can be found in the LICENSE file.
module time
import strconv
// parse_rfc3339 returns time from a date string in RFC 3339 datetime format.
// See also https://ijmacd.github.io/rfc3339-iso8601/ for a visual reference of
// the differences between ISO-8601 and RFC 3339.
@ -79,12 +81,25 @@ pub fn parse(s string) !Time {
minute_ := hms[1]
second_ := hms[2]
//
iyear := ymd[0].int()
imonth := ymd[1].int()
iday := ymd[2].int()
ihour := hour_.int()
iminute := minute_.int()
isecond := second_.int()
iyear := strconv.atoi(ymd[0]) or {
return error_invalid_time(0, 'invalid year format: ${ymd[0]}')
}
imonth := strconv.atoi(ymd[1]) or {
return error_invalid_time(0, 'invalid month format: ${ymd[1]}')
}
iday := strconv.atoi(ymd[2]) or {
return error_invalid_time(0, 'invalid day format: ${ymd[2]}')
}
ihour := strconv.atoi(hour_) or {
return error_invalid_time(0, 'invalid hour format: ${hour_}')
}
iminute := strconv.atoi(minute_) or {
return error_invalid_time(0, 'invalid minute format: ${minute_}')
}
isecond := strconv.atoi(second_) or {
return error_invalid_time(0, 'invalid second format: ${second_}')
}
// eprintln('>> iyear: $iyear | imonth: $imonth | iday: $iday | ihour: $ihour | iminute: $iminute | isecond: $isecond')
if iyear > 9999 || iyear < -9999 {
return error_invalid_time(3, 'year must be between -10000 and 10000')