c39e0217aa
Changes since version 1.34.1: * misc: adjust stalebot deadlines (Jameson Nash) * test: fix env-vars flakiness (cjihrig) * test: avoid truncating output lines (Jameson Nash) * darwin: stop calling SetApplicationIsDaemon() (Ben Noordhuis) * ibmi: implement uv_interface_addresses() (Xu Meng) * osx,fsevent: fix race during uv_loop_close (Jameson Nash) * osx,fsevent: clear pointer when deleting it [NFCI] (Jameson Nash) * Revert "aix: replace ECONNRESET with EOF if already closed" (Jameson Nash) * unix: handle uv__open_cloexec return value correctly (Anna Henningsen) -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIzBAABCgAdFiEElK42Z1xGTWS6+mjddDQ5C9vpucUFAl4pq5MACgkQdDQ5C9vp ucWJxA//fZm/u46gxSeRdWeFu9W1r1CgkJqmWT6vHeeBphk28lAulHAO0AM/bbbd x2WsLS8q7cLk3chwpN4CgJkgS8acqcsuHBGEzqc8o5cd76rCkua7eHvOR83D4Ix4 c46hJH7WF3S4jnVV09iAU+mGplyUPF3F8HvmbTNZnbsuLKj2U88kDjm4nsxiSwdn aMeyZNtM6NdtqHRgIup+SqS4hNvaUt+gD7715efTlGPDwLR3KCJ8Mzd9F4JFrPrT wCjAGLiTFZXFcnwR/Ysx66jQNjfp/fZy7G/zU+7UFKwCjZdwZyybqzy4lmYXtV7N 2hmliaxm3UsYPSD06mA+iUTdD9vnk2/htCNL5OBS11b6lAliYtdNC3l9BQ2Y3TVp xobPcjiRWmvN5P0GIL9/DjK7nxpSdj7BFFyyVz21/+OsYX+NYI4L/Vb4RjezGeGy RMS26S530fOsPCbPlSyEUqvjbTHI95FiLK8Y008YlRRsWVsCxrdrhDjT964LHZ51 nFFPkR0Ghr/y0d9AzBsrsnjAi9g/K+dX3F72S8S2gS3LMkLVr6fLrEQ5AmclAa4f 62TZvnKY3MzjdzsBpslGHHVp3l+HsNdkI27bLCbYUAL/c+R0fl96mac34IHGL+KV b/99O3WMxGtq/Zdn709ryMOLnC+F5KTJpl2LckExfxvubPcu9UQ= =SjB7 -----END PGP SIGNATURE----- Merge tag 'v1.34.2' into merge_1.34.2 PR-URL: https://github.com/libuv/libuv/pull/2649 Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
115 lines
3.0 KiB
C
115 lines
3.0 KiB
C
/* Copyright Bert Belder, and other libuv contributors. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
|
|
#include "uv.h"
|
|
#include "task.h"
|
|
|
|
#ifdef _MSC_VER /* msvc */
|
|
# define NO_INLINE __declspec(noinline)
|
|
#else /* gcc */
|
|
# define NO_INLINE __attribute__ ((noinline))
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
static uv_os_sock_t sock;
|
|
static uv_poll_t handle;
|
|
static int close_cb_called = 0;
|
|
|
|
|
|
static void close_cb(uv_handle_t* h) {
|
|
close_cb_called++;
|
|
}
|
|
|
|
|
|
static void poll_cb(uv_poll_t* h, int status, int events) {
|
|
ASSERT(0 && "should never get here");
|
|
}
|
|
|
|
|
|
static void NO_INLINE close_socket_and_verify_stack(void) {
|
|
const uint32_t MARKER = 0xDEADBEEF;
|
|
const int VERIFY_AFTER = 10; /* ms */
|
|
int r;
|
|
|
|
volatile uint32_t data[65536];
|
|
size_t i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(data); i++)
|
|
data[i] = MARKER;
|
|
|
|
r = closesocket(sock);
|
|
ASSERT(r == 0);
|
|
|
|
uv_sleep(VERIFY_AFTER);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(data); i++)
|
|
ASSERT(data[i] == MARKER);
|
|
}
|
|
#endif
|
|
|
|
|
|
TEST_IMPL(poll_close_doesnt_corrupt_stack) {
|
|
#ifndef _WIN32
|
|
RETURN_SKIP("Test only relevant on Windows");
|
|
#else
|
|
struct WSAData wsa_data;
|
|
int r;
|
|
unsigned long on;
|
|
struct sockaddr_in addr;
|
|
|
|
r = WSAStartup(MAKEWORD(2, 2), &wsa_data);
|
|
ASSERT(r == 0);
|
|
|
|
sock = socket(AF_INET, SOCK_STREAM, 0);
|
|
ASSERT(sock != INVALID_SOCKET);
|
|
on = 1;
|
|
r = ioctlsocket(sock, FIONBIO, &on);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_ip4_addr("127.0.0.1", TEST_PORT, &addr);
|
|
ASSERT(r == 0);
|
|
|
|
r = connect(sock, (const struct sockaddr*) &addr, sizeof addr);
|
|
ASSERT(r != 0);
|
|
ASSERT(WSAGetLastError() == WSAEWOULDBLOCK);
|
|
|
|
r = uv_poll_init(uv_default_loop(), &handle, sock);
|
|
ASSERT(r == 0);
|
|
r = uv_poll_start(&handle, UV_READABLE | UV_WRITABLE, poll_cb);
|
|
ASSERT(r == 0);
|
|
|
|
uv_close((uv_handle_t*) &handle, close_cb);
|
|
|
|
close_socket_and_verify_stack();
|
|
|
|
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
|
ASSERT(r == 0);
|
|
|
|
ASSERT(close_cb_called == 1);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
#endif
|
|
}
|