Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions stl/inc/xloctime
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,13 @@ protected:
if (!(_Res & ios_base::failbit)) {
if (_Digits_read <= 2) {
if (_Ans < 69) {
// CodeQL [SM03231] This is parsing tm_year (years since 1900); leap years are irrelevant.
_Pt->tm_year = _Ans + 100; // [00, 68] parsed as [2000, 2068]
} else if (_Ans < 100) {
_Pt->tm_year = _Ans; // [69, 99] parsed as [1969, 1999]
}
} else {
// CodeQL [SM03231] This is parsing tm_year (years since 1900); leap years are irrelevant.
_Pt->tm_year = _Ans - 1900; // parsed literally
}
}
Expand Down Expand Up @@ -456,6 +458,7 @@ protected:
case 'C':
_State |= _Getint(_First, _Last, 0, 99, _Ans, _Ctype_fac);
if (!(_State & ios_base::failbit)) {
// CodeQL [SM03231] This is parsing tm_year (years since 1900); leap years are irrelevant.
_Pt->tm_year = _Ans * 100 - 1900; // convert to century
}

Expand Down Expand Up @@ -549,15 +552,21 @@ protected:
case 'y':
_State |= _Getint(_First, _Last, 0, 99, _Ans, _Ctype_fac);
if (!(_State & ios_base::failbit)) {
_Pt->tm_year = _Ans < 69 ? _Ans + 100 : _Ans;
if (_Ans < 69) {
// CodeQL [SM03231] This is parsing tm_year (years since 1900); leap years are irrelevant.
_Pt->tm_year = _Ans + 100; // [00, 68] parsed as [2000, 2068]
} else {
_Pt->tm_year = _Ans; // [69, 99] parsed as [1969, 1999]
}
}

break;

case 'Y':
_State |= _Getint(_First, _Last, 0, 9999, _Ans, _Ctype_fac);
if (!(_State & ios_base::failbit)) {
_Pt->tm_year = _Ans - 1900;
// CodeQL [SM03231] This is parsing tm_year (years since 1900); leap years are irrelevant.
_Pt->tm_year = _Ans - 1900; // parsed literally
}
break;

Expand Down