improved file size computation in stat()

On 32 bit it's still overwlowing, so nothing is changed there. But
the usage of LARGE_INTEGER instead of bit shifting is a better way
to go.

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index b061d5a00d08020b66c1ecabc67ef5ea1266d25c..01a91cad80f960cbaa4a01463dd0d618044a776c 100644 (file)
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -294,7 +294,7 @@ CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){
 CWD_API int php_sys_stat_ex(const char *path, zend_stat_t *buf, int lstat) /* {{{ */
 {
        WIN32_FILE_ATTRIBUTE_DATA data;
-       __int64 t;
+       LARGE_INTEGER t;
        const size_t path_len = strlen(path);
        ALLOCA_FLAG(use_heap_large);
 
@@ -393,10 +393,11 @@ CWD_API int php_sys_stat_ex(const char *path, zend_stat_t *buf, int lstat) /* {{
        }
 
        buf->st_nlink = 1;
-       t = data.nFileSizeHigh;
-       t = t << 32;
-       t |= data.nFileSizeLow;
-       buf->st_size = t;
+       t.HighPart = data.nFileSizeHigh;
+       t.LowPart = data.nFileSizeLow;
+       /* It's an overflow on 32 bit, however it won't fix as long
+       as zend_long is 32 bit. */
+       buf->st_size = (zend_long)t.QuadPart;
        buf->st_atime = FileTimeToUnixTime(&data.ftLastAccessTime);
        buf->st_ctime = FileTimeToUnixTime(&data.ftCreationTime);
        buf->st_mtime = FileTimeToUnixTime(&data.ftLastWriteTime);