1 files changed, 8 insertions, 1 deletions
diff --git a/src/librustuv/net.rs b/src/librustuv/net.rs
index cbda25485c7..69d978b2433 100644
--- a/src/librustuv/net.rs
+++ b/src/librustuv/net.rs
@@ -270,7 +270,14 @@ impl TcpWatcher {
             let req = Request::wrap(req);
             if status == uvll::ECANCELED { return }
 
-            let cx: &mut Ctx = unsafe { req.get_data() };
+            // Apparently on windows when the handle is closed this callback may
+            // not be invoked with ECANCELED but rather another error code.
+            // Either ways, if the data is null, then our timeout has expired
+            // and there's nothing we can do.
+            let data = unsafe { uvll::get_data_for_req(req.handle) };
+            if data.is_null() { return }
+
+            let cx: &mut Ctx = unsafe { &mut *(data as *mut Ctx) };
             cx.status = status;
             match cx.timer {
                 Some(ref mut t) => t.stop(),