From ff0ae10496da1e0012e79e8980b12a25fd1ea6b2 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 20 Jul 2016 14:18:50 +0200
Subject: [PATCH] unix: preserve loop->data across loop init/done
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Libuv leaves loop->data unchanged in uv_loop_init() and uv_loop_done()
on Windows but it clobbered it on UNIX platforms.  This commit fixes
that inconsistency.

PR-URL: https://github.com/libuv/libuv/pull/951
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
---
 src/unix/loop.c        | 4 ++++
 src/uv-common.c        | 3 +++
 test/test-loop-close.c | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/unix/loop.c b/src/unix/loop.c
index 92e96f09e..bd63c2f9d 100644
--- a/src/unix/loop.c
+++ b/src/unix/loop.c
@@ -28,11 +28,15 @@
 #include <unistd.h>
 
 int uv_loop_init(uv_loop_t* loop) {
+  void* saved_data;
   int err;
 
   uv__signal_global_once_init();
 
+  saved_data = loop->data;
   memset(loop, 0, sizeof(*loop));
+  loop->data = saved_data;
+
   heap_init((struct heap*) &loop->timer_heap);
   QUEUE_INIT(&loop->wq);
   QUEUE_INIT(&loop->active_reqs);
diff --git a/src/uv-common.c b/src/uv-common.c
index ba2644691..434a5029c 100644
--- a/src/uv-common.c
+++ b/src/uv-common.c
@@ -613,6 +613,7 @@ uv_loop_t* uv_loop_new(void) {
 int uv_loop_close(uv_loop_t* loop) {
   QUEUE* q;
   uv_handle_t* h;
+  void* saved_data;
 
   if (!QUEUE_EMPTY(&(loop)->active_reqs))
     return UV_EBUSY;
@@ -626,7 +627,9 @@ int uv_loop_close(uv_loop_t* loop) {
   uv__loop_close(loop);
 
 #ifndef NDEBUG
+  saved_data = loop->data;
   memset(loop, -1, sizeof(*loop));
+  loop->data = saved_data;
 #endif
   if (loop == default_loop_ptr)
     default_loop_ptr = NULL;
diff --git a/test/test-loop-close.c b/test/test-loop-close.c
index 5aec234ed..971c9d725 100644
--- a/test/test-loop-close.c
+++ b/test/test-loop-close.c
@@ -34,7 +34,9 @@ TEST_IMPL(loop_close) {
   int r;
   uv_loop_t loop;
 
+  loop.data = &loop;
   ASSERT(0 == uv_loop_init(&loop));
+  ASSERT(loop.data == (void*) &loop);
 
   uv_timer_init(&loop, &timer_handle);
   uv_timer_start(&timer_handle, timer_cb, 100, 100);
@@ -47,7 +49,9 @@ TEST_IMPL(loop_close) {
   r = uv_run(&loop, UV_RUN_DEFAULT);
   ASSERT(r == 0);
 
+  ASSERT(loop.data == (void*) &loop);
   ASSERT(0 == uv_loop_close(&loop));
+  ASSERT(loop.data == (void*) &loop);
 
   return 0;
 }