ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

parse-date: time_zone_hhmm() bug fixes 

* fix incorrect arg type used for abs().
* prevent integer arithmetic overflow by limiting offset to 4 digits.
* don't accept malformed offset values like:
    -4:3
    +12:719
    +0000001:23
    -9:00000001
    +0000001123

Reported-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Influenced-by: gnulib 30784c4 Paul Eggert <eggert@cs.ucla.edu>
Signed-off-by: J William Piggott <elseifthen@gmx.com>
This commit is contained in:
J William Piggott 2017-06-14 19:51:30 -04:00
parent dc65dd64ae
commit 480d6bd80a
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/parse-date.y
View File

@ -214,7 +214,7 @@ typedef struct {
union YYSTYPE; union YYSTYPE;
static int yylex (union YYSTYPE *, parser_control *); static int yylex (union YYSTYPE *, parser_control *);
static int yyerror (parser_control const *, char const *); static int yyerror (parser_control const *, char const *);
static long int time_zone_hhmm (parser_control *, textint, intmax_t); static int time_zone_hhmm (parser_control *, textint, textint);
/** /**
* Extract into *PC any date and time info from a string of digits * Extract into *PC any date and time info from a string of digits
@ -307,7 +307,7 @@ set_hhmmss(parser_control *pc, intmax_t hour, intmax_t minutes,
%token <textintval> tSNUMBER tUNUMBER %token <textintval> tSNUMBER tUNUMBER
%token <timespec> tSDECIMAL_NUMBER tUDECIMAL_NUMBER %token <timespec> tSDECIMAL_NUMBER tUDECIMAL_NUMBER
%type <intval> o_colon_minutes %type <textintval> o_colon_minutes
%type <timespec> seconds signed_seconds unsigned_seconds %type <timespec> seconds signed_seconds unsigned_seconds
%type <rel> relunit relunit_snumber dayshift %type <rel> relunit relunit_snumber dayshift
@ -402,7 +402,7 @@ o_zone_offset:
zone_offset: zone_offset:
tSNUMBER o_colon_minutes { tSNUMBER o_colon_minutes {
pc->zones_seen++; pc->zones_seen++;
pc->time_zone = time_zone_hhmm (pc, $1, $2); if (! time_zone_hhmm (pc, $1, $2)) YYABORT;
} }
; ;
@ -455,7 +455,8 @@ zone:
apply_relative_time (pc, $2, 1); apply_relative_time (pc, $2, 1);
} }
| tZONE tSNUMBER o_colon_minutes { | tZONE tSNUMBER o_colon_minutes {
pc->time_zone = $1 + time_zone_hhmm (pc, $2, $3); if (! time_zone_hhmm (pc, $2, $3)) YYABORT;
pc->time_zone += $1;
} }
| tDAYZONE { | tDAYZONE {
pc->time_zone = $1 + 60; pc->time_zone = $1 + 60;
@ -662,9 +663,10 @@ hybrid:
o_colon_minutes: o_colon_minutes:
/* empty */ /* empty */
{ $$ = -1; } { $$.value = $$.digits = 0; }
| ':' tUNUMBER | ':' tUNUMBER {
{ $$ = $2.value; } $$ = $2;
}
; ;
%% %%
@ -855,39 +857,35 @@ static table const military_table[] = {
}; };
/** /**
* Convert a time zone expressed as HH:MM into an integer count of * Convert a time offset expressed as HH:MM or HHMM into an integer count of
* minutes. If MM is negative, then S is of the form HHMM and needs * minutes. If hh is more than 2 digits then it is of the form HHMM and must be
* to be picked apart; otherwise, S is of the form HH. As specified in * delimited; in that case 'mm' is required to be absent. Otherwise, hh and mm
* http://www.opengroup.org/susv3xbd/xbd_chap08.html#tag_08_03, allow * are used ('mm' contains digits that were prefixed with a colon).
* only valid TZ range, and consider first two digits as hours, if no *
* minutes specified. * POSIX TZ and ISO 8601 both define the maximum offset as 24:59. POSIX also
* allows seconds, but currently the parser rejects them. Both require minutes
* to be zero padded (2 digits). ISO requires hours to be zero padded, POSIX
* does not, either is accepted; which means an invalid ISO offset could pass.
*/ */
static long int time_zone_hhmm(parser_control *pc, textint s, intmax_t mm) static int time_zone_hhmm(parser_control *pc, textint hh, textint mm)
{ {
intmax_t n_minutes; int h, m;
/** if (hh.digits > 2 && hh.digits < 5 && mm.digits == 0) {
* If the length of S is 1 or 2 and no minutes are specified, h = hh.value / 100;
* interpret it as a number of hours. m = hh.value % 100;
*/ } else if (hh.digits < 3 && (mm.digits == 0 || mm.digits == 2)) {
if (s.digits <= 2 && mm < 0) h = hh.value;
s.value *= 100; m = hh.negative ? -mm.value : mm.value;
} else
return 0;
if (mm < 0) if (abs(h) > 24 || abs(m) > 59)
n_minutes = (s.value / 100) * 60 + s.value % 100; return 0;
else
n_minutes = s.value * 60 + (s.negative ? -mm : mm);
/** pc->time_zone = h * 60 + m;
* If the absolute number of minutes is larger than 24 hours, return 1;
* arrange to reject it by incrementing pc->zones_seen. Thus,
* we allow only values in the range UTC-24:00 to UTC+24:00.
*/
if (24 * 60 < abs (n_minutes))
pc->zones_seen++;
return n_minutes;
} }
static int to_hour(intmax_t hours, int meridian) static int to_hour(intmax_t hours, int meridian)