From 0f2d7e784a256b54b2385043438848047bc2a629 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 18 Jan 2024 14:51:40 +0100 Subject: [PATCH] fix: always zero-terminate idna output Fixes: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 --- src/idna.c | 5 +++-- test/test-idna.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/idna.c b/src/idna.c index b44cb16..645165c 100644 --- a/src/idna.c +++ b/src/idna.c @@ -307,8 +307,9 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) { return rc; } - if (d < de) - *d++ = '\0'; + if (d >= de) + return UV_EINVAL; + *d++ = '\0'; return d - ds; /* Number of bytes written. */ } diff --git a/test/test-idna.c b/test/test-idna.c index f4fad96..d079be5 100644 --- a/test/test-idna.c +++ b/test/test-idna.c @@ -99,6 +99,7 @@ TEST_IMPL(utf8_decode1) { TEST_IMPL(utf8_decode1_overrun) { const char* p; char b[1]; + char c[1]; /* Single byte. */ p = b; @@ -112,6 +113,9 @@ TEST_IMPL(utf8_decode1_overrun) { ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + 1)); ASSERT_EQ(p, b + 1); + b[0] = 0x7F; + ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 1, c, c + 1)); + return 0; } -- 2.41.0