Skip to content

Commit fa8efa9

Browse files
committed
uv: Upgrade to v0.11.7
1 parent 166c405 commit fa8efa9

File tree

12 files changed

+113
-6
lines changed

12 files changed

+113
-6
lines changed

deps/uv/ChangeLog

+47
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
2013.08.07, Version 0.11.7 (Unstable)
2+
3+
Changes since version 0.11.6:
4+
5+
* unix, windows: fix uv_fs_chown() function prototype (Ben Noordhuis)
6+
7+
* unix, windows: remove unused variables (Brian White)
8+
9+
* test: fix signed/unsigned comparison warnings (Ben Noordhuis)
10+
11+
* build: dtrace shouldn't break out of tree builds (Timothy J. Fontaine)
12+
13+
* unix, windows: don't read/recv if buf.len==0 (Ben Noordhuis)
14+
15+
* build: add mingw makefile (Ben Noordhuis)
16+
17+
* unix, windows: add MAC to uv_interface_addresses() (Brian White)
18+
19+
* build: enable AM_INIT_AUTOMAKE([subdir-objects]) (Ben Noordhuis)
20+
21+
* unix, windows: make buf arg to uv_fs_write const (Ben Noordhuis)
22+
23+
* sunos: fix build breakage introduced in e3a657c (Ben Noordhuis)
24+
25+
* aix: fix build breakage introduced in 3ee4d3f (Ben Noordhuis)
26+
27+
* windows: fix mingw32 build, define JOB_OBJECT_XXX (Yasuhiro Matsumoto)
28+
29+
* windows: fix mingw32 build, include limits.h (Yasuhiro Matsumoto)
30+
31+
* test: replace sprintf() with snprintf() (Ben Noordhuis)
32+
33+
* test: replace strcpy() with strncpy() (Ben Noordhuis)
34+
35+
* openbsd: fix uv_ip6_addr() unused variable warnings (Ben Noordhuis)
36+
37+
* openbsd: fix dlerror() const correctness warning (Ben Noordhuis)
38+
39+
* openbsd: fix uv_fs_sendfile() unused variable warnings (Ben Noordhuis)
40+
41+
* build: disable parallel automake tests (Ben Noordhuis)
42+
43+
* test: add windows-only snprintf() function (Ben Noordhuis)
44+
45+
* build: add automake serial-tests version check (Ben Noordhuis)
46+
47+
148
2013.07.26, Version 0.10.13 (Stable), 381312e1fe6fecbabc943ccd56f0e7d114b3d064
249

350
Changes since version 0.10.12:

deps/uv/configure.ac

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
AC_PREREQ(2.57)
1616
AC_INIT([libuv], [0.11.5], [https://github.com/joyent/libuv/issues])
17-
AM_INIT_AUTOMAKE([foreign subdir-objects -Wall -Werror])
17+
# Use AM_SILENT_RULES as an ad-hoc version check to find out if it's safe
18+
# to use the serial-tests directive. Both were added in automake v0.11.
19+
AM_INIT_AUTOMAKE(m4_ifdef([AM_SILENT_RULES],
20+
[-Wall -Werror foreign subdir-objects serial-tests],
21+
[-Wall -Werror foreign subdir-objects]))
1822
AC_CONFIG_MACRO_DIR([m4])
1923
AC_CANONICAL_HOST
2024
AC_ENABLE_SHARED

deps/uv/m4/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignore libtoolize-generated files.
2+
*.m4

deps/uv/src/unix/dl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const char* uv_dlerror(uv_lib_t* lib) {
6565

6666

6767
static int uv__dlerror(uv_lib_t* lib) {
68-
char* errmsg;
68+
const char* errmsg;
6969

7070
if (lib->errmsg)
7171
free(lib->errmsg);

deps/uv/src/unix/fs.c

+4
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,10 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
468468
return -1;
469469
}
470470
#else
471+
/* Squelch compiler warnings. */
472+
(void) &in_fd;
473+
(void) &out_fd;
474+
471475
return uv__fs_sendfile_emul(req);
472476
#endif
473477
}

deps/uv/src/uv-common.c

+2
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,11 @@ struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
140140

141141
struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) {
142142
struct sockaddr_in6 addr;
143+
#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS)
143144
char address_part[40];
144145
size_t address_part_size;
145146
const char* zone_index;
147+
#endif
146148

147149
memset(&addr, 0, sizeof(struct sockaddr_in6));
148150

deps/uv/src/version.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define UV_VERSION_MAJOR 0
3333
#define UV_VERSION_MINOR 11
3434
#define UV_VERSION_PATCH 7
35-
#define UV_VERSION_IS_RELEASE 0
35+
#define UV_VERSION_IS_RELEASE 1
3636

3737

3838
#define UV_VERSION ((UV_VERSION_MAJOR << 16) | \

deps/uv/src/win/process.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <stdio.h>
2525
#include <stdlib.h>
2626
#include <signal.h>
27+
#include <limits.h>
2728

2829
#include "uv.h"
2930
#include "internal.h"

deps/uv/src/win/winapi.h

+19
Original file line numberDiff line numberDiff line change
@@ -4073,6 +4073,25 @@
40734073
((NTSTATUS) (error)) : ((NTSTATUS) (((error) & 0x0000FFFF) | \
40744074
(FACILITY_NTWIN32 << 16) | ERROR_SEVERITY_WARNING)))
40754075

4076+
#ifndef JOB_OBJECT_LIMIT_PROCESS_MEMORY
4077+
# define JOB_OBJECT_LIMIT_PROCESS_MEMORY 0x00000100
4078+
#endif
4079+
#ifndef JOB_OBJECT_LIMIT_JOB_MEMORY
4080+
# define JOB_OBJECT_LIMIT_JOB_MEMORY 0x00000200
4081+
#endif
4082+
#ifndef JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION
4083+
# define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x00000400
4084+
#endif
4085+
#ifndef JOB_OBJECT_LIMIT_BREAKAWAY_OK
4086+
# define JOB_OBJECT_LIMIT_BREAKAWAY_OK 0x00000800
4087+
#endif
4088+
#ifndef JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK
4089+
# define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK 0x00001000
4090+
#endif
4091+
#ifndef JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE
4092+
# define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000
4093+
#endif
4094+
40764095
/* from ntifs.h */
40774096
/* MinGW already has it, mingw-w64 does not. */
40784097
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)

deps/uv/test/runner-unix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void platform_init(int argc, char **argv) {
4949
/* Disable stdio output buffering. */
5050
setvbuf(stdout, NULL, _IONBF, 0);
5151
setvbuf(stderr, NULL, _IONBF, 0);
52-
strcpy(executable_path, argv[0]);
52+
strncpy(executable_path, argv[0], sizeof(executable_path) - 1);
5353
signal(SIGPIPE, SIG_IGN);
5454
}
5555

deps/uv/test/task.h

+28
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,32 @@ enum test_status {
153153
return TEST_SKIP; \
154154
} while (0)
155155

156+
#ifdef _WIN32
157+
158+
#include <stdarg.h>
159+
160+
/* Emulate snprintf() on Windows, _snprintf() doesn't zero-terminate the buffer
161+
* on overflow...
162+
*/
163+
static int snprintf(char* buf, size_t len, const char* fmt, ...) {
164+
va_list ap;
165+
int n;
166+
167+
va_start(ap, fmt);
168+
n = _vsprintf_p(buf, len, fmt, ap);
169+
va_end(ap);
170+
171+
/* It's a sad fact of life that no one ever checks the return value of
172+
* snprintf(). Zero-terminating the buffer hopefully reduces the risk
173+
* of gaping security holes.
174+
*/
175+
if (n < 0)
176+
if (len > 0)
177+
buf[0] = '\0';
178+
179+
return n;
180+
}
181+
182+
#endif
183+
156184
#endif /* TASK_H_ */

deps/uv/test/test-ip6-addr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ void test_ip6_addr_scope(const char* ip6_addr,
7676
if (strncmp(ip6_addr, "fe80::", 6) != 0) return;
7777

7878
#ifdef _WIN32
79-
sprintf(scoped_addr, "%s%%%d", ip6_addr, iface_index);
79+
snprintf(scoped_addr, sizeof(scoped_addr), "%s%%%d", ip6_addr, iface_index);
8080
#else
81-
sprintf(scoped_addr, "%s%%%s", ip6_addr, device_name);
81+
snprintf(scoped_addr, sizeof(scoped_addr), "%s%%%s", ip6_addr, device_name);
8282
#endif
8383

8484
LOGF("Testing link-local address %s (iface_index: 0x%02x, device_name: %s)\n",

0 commit comments

Comments
 (0)