diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-19 12:15:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-19 12:15:55 -0400 |
| commit | b421648da2d3e73e0cfd6fd847c3279f64a332cd (patch) | |
| tree | b55afd610297548013d4f1753dec068850135465 /src/common/compat_threads.c | |
| parent | 2c96d95c12a8d8678ec5821d83072afe045755ff (diff) | |
| parent | 429d15c5291d9d6668457b7070f8c5fc2c6994e1 (diff) | |
| download | tor-b421648da2d3e73e0cfd6fd847c3279f64a332cd.tar.gz tor-b421648da2d3e73e0cfd6fd847c3279f64a332cd.zip | |
Merge remote-tracking branch 'public/thread_coverage'
Diffstat (limited to 'src/common/compat_threads.c')
| -rw-r--r-- | src/common/compat_threads.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index 9c6fa55b32..f4809060d6 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -61,8 +61,8 @@ tor_cond_t * tor_cond_new(void) { tor_cond_t *cond = tor_malloc(sizeof(tor_cond_t)); - if (tor_cond_init(cond)<0) - tor_free(cond); + if (BUG(tor_cond_init(cond)<0)) + tor_free(cond); // LCOV_EXCL_LINE return cond; } @@ -240,8 +240,11 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) if (socks[0] >= 0) { if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || set_socket_nonblocking(socks[0]) < 0) { + // LCOV_EXCL_START -- if eventfd succeeds, fcntl will. + tor_assert_nonfatal_unreached(); close(socks[0]); return -1; + // LCOV_EXCL_STOP } } } @@ -275,9 +278,12 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) fcntl(socks[1], F_SETFD, FD_CLOEXEC) < 0 || set_socket_nonblocking(socks[0]) < 0 || set_socket_nonblocking(socks[1]) < 0) { + // LCOV_EXCL_START -- if pipe succeeds, you can fcntl the output + tor_assert_nonfatal_unreached(); close(socks[0]); close(socks[1]); return -1; + // LCOV_EXCL_STOP } socks_out->read_fd = socks[0]; socks_out->write_fd = socks[1]; @@ -292,9 +298,12 @@ alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) tor_socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == 0) { if (set_socket_nonblocking(socks[0]) < 0 || set_socket_nonblocking(socks[1])) { + // LCOV_EXCL_START -- if socketpair worked, you can make it nonblocking. + tor_assert_nonfatal_unreached(); tor_close_socket(socks[0]); tor_close_socket(socks[1]); return -1; + // LCOV_EXCL_STOP } socks_out->read_fd = socks[0]; socks_out->write_fd = socks[1]; |