From b3dc3a5cbfda177ad453363362f473e57f2dabcf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bastien=20Roucari=C3=A8s?= Date: Sun, 27 Apr 2025 15:42:15 +0200 Subject: [PATCH] Get libuv nodejs in sync with libuv/bookworm forwarded: not-needed Gbp-Pq: Topic libuv Gbp-Pq: Name 0000-bookworm-sync.patch --- deps/uv/include/uv/win.h | 2 +- deps/uv/src/idna.c | 8 ++------ deps/uv/src/win/poll.c | 4 +++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deps/uv/include/uv/win.h b/deps/uv/include/uv/win.h index 155c43550..56a4cf115 100644 --- a/deps/uv/include/uv/win.h +++ b/deps/uv/include/uv/win.h @@ -223,7 +223,7 @@ typedef struct _AFD_POLL_INFO { AFD_POLL_HANDLE_INFO Handles[1]; } AFD_POLL_INFO, *PAFD_POLL_INFO; -#define UV_MSAFD_PROVIDER_COUNT 3 +#define UV_MSAFD_PROVIDER_COUNT 4 /** diff --git a/deps/uv/src/idna.c b/deps/uv/src/idna.c index 858b19d00..93d982ca0 100644 --- a/deps/uv/src/idna.c +++ b/deps/uv/src/idna.c @@ -274,9 +274,6 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) { char* ds; int rc; - if (s == se) - return UV_EINVAL; - ds = d; si = s; @@ -311,9 +308,8 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) { return rc; } - if (d >= de) - return UV_EINVAL; + if (d < de) + *d++ = '\0'; - *d++ = '\0'; return d - ds; /* Number of bytes written. */ } diff --git a/deps/uv/src/win/poll.c b/deps/uv/src/win/poll.c index 53a4fd976..bd531b067 100644 --- a/deps/uv/src/win/poll.c +++ b/deps/uv/src/win/poll.c @@ -34,7 +34,9 @@ static const GUID uv_msafd_provider_ids[UV_MSAFD_PROVIDER_COUNT] = { {0xf9eab0c0, 0x26d4, 0x11d0, {0xbb, 0xbf, 0x00, 0xaa, 0x00, 0x6c, 0x34, 0xe4}}, {0x9fc48064, 0x7298, 0x43e4, - {0xb7, 0xbd, 0x18, 0x1f, 0x20, 0x89, 0x79, 0x2a}} + {0xb7, 0xbd, 0x18, 0x1f, 0x20, 0x89, 0x79, 0x2a}}, + {0xa00943d9, 0x9c2e, 0x4633, + {0x9b, 0x59, 0x00, 0x57, 0xa3, 0x16, 0x09, 0x94}} }; typedef struct uv_single_fd_set_s { -- 2.30.2