diff options
author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-12-13 12:07:04 +0100 |
---|---|---|
committer | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-12-14 21:53:42 +0100 |
commit | 69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe (patch) | |
tree | d2afb35396d77e45647e1818357a7e17b2be2244 /deps/uv/src/win/getaddrinfo.c | |
parent | e0bb118a1d5f8b6b1eb2405f2dc19b8118f8ec0e (diff) | |
download | android-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.tar.gz android-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.tar.bz2 android-node-v8-69b94ec55cb0f8bd90475b5b7dabd57beb7e7dfe.zip |
deps: upgrade libuv to 1.8.0
Fixes: https://github.com/nodejs/node/issues/3718
PR-URL: https://github.com/nodejs/node/pull/4276
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/uv/src/win/getaddrinfo.c')
-rw-r--r-- | deps/uv/src/win/getaddrinfo.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/deps/uv/src/win/getaddrinfo.c b/deps/uv/src/win/getaddrinfo.c index 3d23660e88..ceed3b7638 100644 --- a/deps/uv/src/win/getaddrinfo.c +++ b/deps/uv/src/win/getaddrinfo.c @@ -109,10 +109,8 @@ static void uv__getaddrinfo_done(struct uv__work* w, int status) { req = container_of(w, uv_getaddrinfo_t, work_req); /* release input parameter memory */ - if (req->alloc != NULL) { - uv__free(req->alloc); - req->alloc = NULL; - } + uv__free(req->alloc); + req->alloc = NULL; if (status == UV_ECANCELED) { assert(req->retcode == 0); @@ -219,9 +217,7 @@ void uv_freeaddrinfo(struct addrinfo* ai) { char* alloc_ptr = (char*)ai; /* release copied result memory */ - if (alloc_ptr != NULL) { - uv__free(alloc_ptr); - } + uv__free(alloc_ptr); } @@ -354,8 +350,9 @@ int uv_getaddrinfo(uv_loop_t* loop, } error: - if (req != NULL && req->alloc != NULL) { + if (req != NULL) { uv__free(req->alloc); + req->alloc = NULL; } return uv_translate_sys_error(err); } |