Skip to content

Commit 140f697

Browse files
committed
---
yaml --- r: 95995 b: refs/heads/dist-snap c: 497d63f h: refs/heads/master i: 95993: b0554d3 95991: 795bf10 v: v3
1 parent 433b337 commit 140f697

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: aa78c3d6f6b25a0e54f815cd8db765000763e48a
9+
refs/heads/dist-snap: 497d63f0bcc6436ae5a5f824946caca8f6d6fb53
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustuv/file.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ impl FsRequest {
256256
let path = unsafe { Path::new(CString::new(path, false)) };
257257
let stat = self.get_stat();
258258
fn to_msec(stat: uvll::uv_timespec_t) -> u64 {
259-
(stat.tv_sec * 1000 + stat.tv_nsec / 1000000) as u64
259+
// Be sure to cast to u64 first to prevent overflowing if the tv_sec
260+
// field is a 32-bit integer.
261+
(stat.tv_sec as u64) * 1000 + (stat.tv_nsec as u64) / 1000000
260262
}
261263
let kind = match (stat.st_mode as c_int) & libc::S_IFMT {
262264
libc::S_IFREG => io::TypeFile,

0 commit comments

Comments
 (0)