Fix #78282: atime and mtime mismatch

The fix for bug #78241 assumed that `time_t` would always be 64bit, but actually is 32bit for x86. We therefore enforce 64bit arithmetic to avoid wrapping.
aoubeid · Jul 13, 2019 · bf242d5 · bf242d5
1 parent 1c1de0c
commit bf242d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -8,6 +8,9 @@ PHP                                                                        NEWS
 - Recode:
   . Unbundled the recode extension. (cmb)
 
+- Standard:
+  . Fixed bug #78282 (atime and mtime mismatch). (cmb)
+
 11 Jul 2019, PHP 7.4.0alpha3
 
 - Core:

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -769,7 +769,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {
 	// Note that LONGLONG is a 64-bit value
 	LONGLONG ll;
 
-	ll = t * 10000000 + 116444736000000000;
+	ll = t * 10000000LL + 116444736000000000LL;
 	pft->dwLowDateTime = (DWORD)ll;
 	pft->dwHighDateTime = ll >> 32;
 }