1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check date validity in calendar methods taking a QDate

Browse Source 
Previously neglected, in dateFromParts() and dayOfWeek(), which only
make sense for valid dates.

Change-Id: I44879bb441dbf51b96c8fd4d45e8f07423e63047
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit ac1008c16f58d95ae4ff0a7864e3bcb0783cc439)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2020-12-10 16:19:17 +01:00 committed by Qt Cherry-pick Bot
parent 4339088503
commit b99caf8f26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/time/qcalendar.cpp
View File

@ -1059,7 +1059,7 @@ QDate QCalendar::dateFromParts(const QCalendar::YearMonthDay &parts) const
*/ */
QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const
{ {
return d ? d->julianDayToDate(date.toJulianDay()) : YearMonthDay(); return d && date.isValid() ? d->julianDayToDate(date.toJulianDay()) : YearMonthDay();
} }
/*! /*!
@ -1073,7 +1073,7 @@ QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const
*/ */
int QCalendar::dayOfWeek(QDate date) const int QCalendar::dayOfWeek(QDate date) const
{ {
return d ? d->dayOfWeek(date.toJulianDay()) : 0; return d && date.isValid() ? d->dayOfWeek(date.toJulianDay()) : 0;
} }
// Locale data access // Locale data access