Fix #78282: atime and mtime mismatch

cmb69 · cmb69 · commit 954543cec629 · 2019-08-06T17:25:54.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. (cherry picked from commit bf242d5)
diff --git a/NEWS b/NEWS
@@ -26,6 +26,7 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)
     with invalid length). (Nikita)
+  . Fixed bug #78282 (atime and mtime mismatch). (cmb)
   . Fixed bug #78326 (improper memory deallocation on stream_get_contents()
     with fixed length buffer). (Albert Casademont)
 
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -804,7 +804,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
`@@ -804,7 +804,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {`
`804`	`804`	`// Note that LONGLONG is a 64-bit value`
`805`	`805`	`LONGLONG ll;`
`806`	`806`
`807`		`- ll = t * 10000000 + 116444736000000000;`
	`807`	`+ ll = t * 10000000LL + 116444736000000000LL;`
`808`	`808`	`pft->dwLowDateTime = (DWORD)ll;`
`809`	`809`	`pft->dwHighDateTime = ll >> 32;`
`810`	`810`	`}`