diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-09-22 22:00:38 +0200 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2015-10-01 10:40:39 -0400 |
| commit | 07a43eb1297109a4aad6fb410e3320bcaf1d90aa (patch) | |
| tree | 6f367e13f5b0686331aec4adf0a2317a71d16635 /deps/uv/src/unix/darwin.c | |
| parent | a6aab430936c4c2791dbb29d8adec9d9a12f9376 (diff) | |
| download | android-node-v8-07a43eb1297109a4aad6fb410e3320bcaf1d90aa.tar.gz android-node-v8-07a43eb1297109a4aad6fb410e3320bcaf1d90aa.tar.bz2 android-node-v8-07a43eb1297109a4aad6fb410e3320bcaf1d90aa.zip | |
deps: upgrade libuv to 1.7.5
PR-URL: https://github.com/nodejs/node/pull/3010
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index 718a81e4c1..dab6ca999d 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -199,8 +199,10 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { } *cpu_infos = uv__malloc(numcpus * sizeof(**cpu_infos)); - if (!(*cpu_infos)) - return -ENOMEM; /* FIXME(bnoordhuis) Deallocate info? */ + if (!(*cpu_infos)) { + vm_deallocate(mach_task_self(), (vm_address_t)info, msg_type); + return -ENOMEM; + } *count = numcpus; |