Fix #78282: atime and mtime mismatch

cmb69 · cmb69 · commit bf242d58e77d · 2019-07-13T09:44:46.000+02:00
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.
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {`
`769`	`769`	`// Note that LONGLONG is a 64-bit value`
`770`	`770`	`LONGLONG ll;`
`771`	`771`
`772`		`- ll = t * 10000000 + 116444736000000000;`
	`772`	`+ ll = t * 10000000LL + 116444736000000000LL;`
`773`	`773`	`pft->dwLowDateTime = (DWORD)ll;`
`774`	`774`	`pft->dwHighDateTime = ll >> 32;`
`775`	`775`	`}`