luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: always zero-terminate idna output

Browse Source
This commit is contained in:
Ben Noordhuis 2024-01-18 14:51:40 +01:00 committed by Santiago Gimeno
parent bb6fbcf6e7
commit fd08591bf9
No known key found for this signature in database
GPG Key ID: F28C3C8DA33C03BE
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/idna.c
View File

@ -356,9 +356,10 @@ ssize_t uv__idna_toascii(const char* s, const char* se, char* d, char* de) {
return rc; return rc;
} }
if (d < de) if (d >= de)
*d++ = '\0'; return UV_EINVAL;
*d++ = '\0';
return d - ds; /* Number of bytes written. */ return d - ds; /* Number of bytes written. */
} }

4
test/test-idna.c
View File

@ -100,6 +100,7 @@ TEST_IMPL(utf8_decode1) {
TEST_IMPL(utf8_decode1_overrun) { TEST_IMPL(utf8_decode1_overrun) {
const char* p; const char* p;
char b[1]; char b[1];
char c[1];
/* Single byte. */ /* Single byte. */
p = b; p = b;
@ -113,6 +114,9 @@ TEST_IMPL(utf8_decode1_overrun) {
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + 1)); ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + 1));
ASSERT_PTR_EQ(p, b + 1); ASSERT_PTR_EQ(p, b + 1);
b[0] = 0x7F;
ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 1, c, c + 1));
return 0; return 0;
} }