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

QLocalTime: getCurrentStandardUtcOffset: fix narrowing warnings

Browse Source 
UTC offset in seconds can't be bigger than 24 hours, so it should fit in
an int. Explicitly cast to int and add asserts.

Change-Id: I45460a0489a134e4ad03bdab112f067d5913709a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-03-11 03:24:09 +02:00
parent 5bffb47d6e
commit f948835e62
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/time/qlocaltime.cpp
View File

@ -202,12 +202,19 @@ int getCurrentStandardUtcOffset()
*/ */
# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) # if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
struct tm t; struct tm t;
if (gmtime_r(&curr, &t)) if (gmtime_r(&curr, &t)) {
return curr - qMkTime(&t); time_t mkt = qMkTime(&t);
int offset = int(curr - mkt);
Q_ASSERT(std::abs(offset) <= SECS_PER_DAY);
return offset;
}
# else # else
if (struct tm *tp = gmtime(&curr)) { if (struct tm *tp = gmtime(&curr)) {
struct tm t = *tp; // Copy it quick, hopefully before it can get stomped struct tm t = *tp; // Copy it quick, hopefully before it can get stomped
return curr - qMkTime(&t); time_t mkt = qMkTime(&t);
int offset = int(curr - mkt);
Q_ASSERT(std::abs(offset) <= SECS_PER_DAY);
return offset;
} }
# endif # endif
} // else, presumably: errno == EOVERFLOW } // else, presumably: errno == EOVERFLOW