From 7e3c6465770ab346764bf51ab2edd745390eb7d6 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 17 Feb 2021 11:28:51 +0100 Subject: Correct qt_mktime()'s check for last second in 1969 It was comparing time->second() to MSECS_PER_DAY - 1, but time->second() is the second within its minute, so is at most 59. It should be comparing seconds into the day to SECS_PER_DAY - 1. Prompted by a PVS-studio article. Change-Id: I1802c49fa18818f4b4fe74f187da5f799df7d1de Reviewed-by: Thiago Macieira (cherry picked from commit 94b9ee03b5646bf58c12337bbc44e38265ad15a2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/time/qdatetime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index f85e4115bb..62a5531c03 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2485,7 +2485,7 @@ static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStat *abbreviation = qt_tzname(QDateTimePrivate::StandardTime); } } else if (yy == 1969 && mm == 12 && dd == 31 - && time->second() == MSECS_PER_DAY - 1) { + && QTime(0, 0).secsTo(*time) == SECS_PER_DAY - 1) { // There was, of course, a last second in 1969, at time_t(-1); we won't // rescue it if it's not in normalised form, and we don't know its DST // status (unless we did already), but let's not wantonly declare it -- cgit v1.2.3