diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-06-05 19:47:33 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-05 22:12:49 +0200 |
| commit | a5bd466440f49bc6ba74c99714112a333ab71bd9 (patch) | |
| tree | 6894d88f5b29a281c6e6dcb54586f26641c9d439 /deps/uv | |
| parent | 2dcef83b5fce615cc486ab10692a6925cba037ca (diff) | |
| download | nodejs-a5bd466440f49bc6ba74c99714112a333ab71bd9.tar.gz nodejs-a5bd466440f49bc6ba74c99714112a333ab71bd9.tar.bz2 nodejs-a5bd466440f49bc6ba74c99714112a333ab71bd9.zip | |
deps: update libuv to version 1.6.1
PR-URL: https://github.com/nodejs/io.js/pull/1905
Refs: https://github.com/nodejs/io.js/pull/1791
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/uv')
| -rw-r--r-- | deps/uv/ChangeLog | 7 | ||||
| -rw-r--r-- | deps/uv/configure.ac | 2 | ||||
| -rw-r--r-- | deps/uv/include/uv-version.h | 2 | ||||
| -rw-r--r-- | deps/uv/src/unix/core.c | 9 |
4 files changed, 15 insertions, 5 deletions
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog index 147a80ff7..5d3a4cad4 100644 --- a/deps/uv/ChangeLog +++ b/deps/uv/ChangeLog @@ -1,3 +1,10 @@ +2015.06.06, Version 1.6.1 (Stable), 30c8be07bb78a66fdee5141626bf53a49a17094a + +Changes since version 1.6.0: + +* unix: handle invalid _SC_GETPW_R_SIZE_MAX values (cjihrig) + + 2015.06.04, Version 1.6.0 (Stable), adfccad76456061dfcf79b8df8e7dbfee51791d7 Changes since version 1.5.0: diff --git a/deps/uv/configure.ac b/deps/uv/configure.ac index 3fa01a254..fe7228e2b 100644 --- a/deps/uv/configure.ac +++ b/deps/uv/configure.ac @@ -13,7 +13,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_PREREQ(2.57) -AC_INIT([libuv], [1.6.0], [https://github.com/libuv/libuv/issues]) +AC_INIT([libuv], [1.6.1], [https://github.com/libuv/libuv/issues]) AC_CONFIG_MACRO_DIR([m4]) m4_include([m4/libuv-extra-automake-flags.m4]) m4_include([m4/as_case.m4]) diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h index 2e2311ece..3372212c8 100644 --- a/deps/uv/include/uv-version.h +++ b/deps/uv/include/uv-version.h @@ -32,7 +32,7 @@ #define UV_VERSION_MAJOR 1 #define UV_VERSION_MINOR 6 -#define UV_VERSION_PATCH 0 +#define UV_VERSION_PATCH 1 #define UV_VERSION_IS_RELEASE 1 #define UV_VERSION_SUFFIX "" diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c index cfb763043..826b4113b 100644 --- a/deps/uv/src/unix/core.c +++ b/deps/uv/src/unix/core.c @@ -1000,6 +1000,7 @@ int uv_os_homedir(char* buffer, size_t* size) { uid_t uid; size_t bufsize; size_t len; + long initsize; int r; if (buffer == NULL || size == NULL || *size == 0) @@ -1023,10 +1024,12 @@ int uv_os_homedir(char* buffer, size_t* size) { } /* HOME is not set, so call getpwuid() */ - bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); + initsize = sysconf(_SC_GETPW_R_SIZE_MAX); - if (bufsize <= 0) - return -EIO; + if (initsize <= 0) + bufsize = 4096; + else + bufsize = (size_t) initsize; uid = getuid(); buf = NULL; |