DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle date difference for ends of months (#553)

Browse Source 
The incrementally calling `Window::Globalization::Calendar::AddMonths`
resulted in a negative value for `GetDifferenceInDays` which was then
assigned to an unsigned variable `daysDiff`.

One example of the issue when running the calculator in UTC+2 was the
difference between July 31st and December 30th.

The initial guess was 4 months which then landed on November 30th.
This date was stored and then in the loop incremeted by one month.
This then landed precisely on the end date December 30th.
After the loop the final value is then used July 31st + 5 months
which results in the 31st of December.
The resulting difference of -1 days is then assigned to the unsigned
value `daysDiff`.

This commit makes the minimal changes to remedy this bug.
It makes sure to only ever call `AddMonths` with the same starting date
instead of incrementally to different dates.

fixes #552
This commit is contained in:
Peter Tissen 2019-06-18 01:05:31 +02:00 committed by Eric Wong
parent 1ee438ddaf
commit dab589b3e0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CalcViewModel/Common/DateCalculator.cpp
View File

@ -206,7 +206,7 @@ void DateCalculationEngine::GetDateDifference(_In_ DateTime date1, _In_ DateTime
// pivotDate is still below the end date // pivotDate is still below the end date
try try
{ {
pivotDate = AdjustCalendarDate(pivotDate, dateUnit, 1); pivotDate = AdjustCalendarDate(tempPivotDate, dateUnit, static_cast<int>(differenceInDates[unitIndex] + 1));
differenceInDates[unitIndex] += 1; differenceInDates[unitIndex] += 1;
} }
catch (Platform::InvalidArgumentException ^) catch (Platform::InvalidArgumentException ^)