---

yaml
---
r: 96935
b: refs/heads/dist-snap
c: f25c81a
h: refs/heads/master
i:
  96933: b67650e
  96931: 21972b7
  96927: 324d241
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 962af9198f8f2a1e2d5121ac216b6f4d574ae54c
+refs/heads/dist-snap: f25c81a51a752786ce8936b503c16912478a89fd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -138,6 +138,10 @@ impl QueuePool {
         }
         Queue { queue: self.producer.clone() }
     }
+
+    pub fn handle(&self) -> *uvll::uv_async_t {
+        unsafe { (*self.producer.packet()).handle }
+    }
 }
 
 impl Queue {
@@ -180,7 +184,9 @@ impl Drop for State {
     fn drop(&mut self) {
         unsafe {
             uvll::uv_close(self.handle, cast::transmute(0));
-            uvll::free_handle(self.handle);
+            // Note that this does *not* free the handle, that is the
+            // responsibility of the caller because the uv loop must be closed
+            // before we deallocate this uv handle.
         }
     }
 }

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

@@ -67,9 +67,13 @@ impl Drop for UvEventLoop {
     fn drop(&mut self) {
         // Must first destroy the pool of handles before we destroy the loop
         // because otherwise the contained async handle will be destroyed after
-        // the loop is free'd (use-after-free)
+        // the loop is free'd (use-after-free). We also must free the uv handle
+        // after the loop has been closed because during the closing of the loop
+        // the handle is required to be used apparently.
+        let handle = self.uvio.handle_pool.get_ref().handle();
         self.uvio.handle_pool.take();
         self.uvio.loop_.close();
+        unsafe { uvll::free_handle(handle) }
     }
 }