Skip to content

Commit a5bd466

Browse files
saghulbnoordhuis
authored andcommitted
deps: update libuv to version 1.6.1
PR-URL: #1905 Refs: #1791 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]>
1 parent 2dcef83 commit a5bd466

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

deps/uv/ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2015.06.06, Version 1.6.1 (Stable), 30c8be07bb78a66fdee5141626bf53a49a17094a
2+
3+
Changes since version 1.6.0:
4+
5+
* unix: handle invalid _SC_GETPW_R_SIZE_MAX values (cjihrig)
6+
7+
18
2015.06.04, Version 1.6.0 (Stable), adfccad76456061dfcf79b8df8e7dbfee51791d7
29

310
Changes since version 1.5.0:

deps/uv/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.6.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.6.1], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/include/uv-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 6
35-
#define UV_VERSION_PATCH 0
35+
#define UV_VERSION_PATCH 1
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

deps/uv/src/unix/core.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,7 @@ int uv_os_homedir(char* buffer, size_t* size) {
10001000
uid_t uid;
10011001
size_t bufsize;
10021002
size_t len;
1003+
long initsize;
10031004
int r;
10041005

10051006
if (buffer == NULL || size == NULL || *size == 0)
@@ -1023,10 +1024,12 @@ int uv_os_homedir(char* buffer, size_t* size) {
10231024
}
10241025

10251026
/* HOME is not set, so call getpwuid() */
1026-
bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
1027+
initsize = sysconf(_SC_GETPW_R_SIZE_MAX);
10271028

1028-
if (bufsize <= 0)
1029-
return -EIO;
1029+
if (initsize <= 0)
1030+
bufsize = 4096;
1031+
else
1032+
bufsize = (size_t) initsize;
10301033

10311034
uid = getuid();
10321035
buf = NULL;

0 commit comments

Comments
 (0)