Fix a Y2038 bug by replacing Int32x32To64 with regular multiplication
#12027
+5
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Int32x32To64 macro internally truncates the arguments to int32, while time_t is 64-bit on most/all modern platforms. Therefore, usage of this macro creates a Year 2038 bug.
|
|
| @@ -89,22 +89,20 @@ bool Utility::hasDarkSystray() | |||
|
|
|||
| void Utility::UnixTimeToFiletime(time_t t, FILETIME *filetime) | |||
There was a problem hiding this comment.
function is unused as far as I can tell. @erikjv am I missing anything?
| filetime->dwLowDateTime = (DWORD) ll; | ||
| filetime->dwHighDateTime = ll >>32; | ||
| } | ||
|
|
||
| void Utility::FiletimeToLargeIntegerFiletime(FILETIME *filetime, LARGE_INTEGER *hundredNSecs) | ||
| void Utility::FiletimeToLargeIntegerFiletime(const FILETIME *filetime, LARGE_INTEGER *hundredNSecs) |
| LONGLONG ll = Int32x32To64(t, 10000000) + 116444736000000000; | ||
| hundredNSecs->LowPart = (DWORD) ll; | ||
| hundredNSecs->HighPart = ll >>32; | ||
| hundredNSecs->QuadPart = (t * 10000000LL) + 116444736000000000LL; |
There was a problem hiding this comment.
This should be covered by a unit test .....
| @@ -48,8 +48,7 @@ Q_LOGGING_CATEGORY(lcCSyncCtime, "sync.csync.c_time", QtInfoMsg) | |||
| //after Microsoft KB167296 | |||
| static void UnixTimevalToFileTime(struct timeval t, LPFILETIME pft) | |||
| { | |||
| LONGLONG ll; | |||
| ll = Int32x32To64(t.tv_sec, CSYNC_USEC_IN_SEC*10) + t.tv_usec*10 + CSYNC_SECONDS_SINCE_1601*CSYNC_USEC_IN_SEC*10; | |||
| LONGLONG ll = t.tv_sec * CSYNC_USEC_IN_SEC*10 + t.tv_usec*10 + CSYNC_SECONDS_SINCE_1601*CSYNC_USEC_IN_SEC*10; | |||
DeepDiver1975
requested changes
Jan 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Int32x32To64macro internally truncates the arguments to int32, whiletime_tis 64-bit on most/all modern platforms. Therefore, usage of this macro creates a Year 2038 bug.I detailed this issue a while ago in a writeup, and spotted the same issue in this repository when updating the list of affected repositories:
https://cookieplmonster.github.io/2022/02/17/year-2038-problem/
Note: I don't know if
src/csync/std/c_time.cppshould be edited as part of this repository, or another upstream source. At the moment I included the necessary changes in this PR, but if this part of the PR needs to be directed elsewhere I'm happy to do so instead.