diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-16 14:27:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-16 14:28:16 (GMT) |
| commit | 45a46e97b730ba7971fe50608175154b44235504 (patch) | |
| tree | 3407f85fd033b60c96ebc03dad5d55c8182691c5 | |
| parent | e69b8a4ff18447f4b310410ed973bf918a21a789 (diff) | |
| parent | 890beb19e6fdb23d7cfeeac212d7fe3a3d98e409 (diff) | |
| download | CMake-45a46e97b730ba7971fe50608175154b44235504.zip CMake-45a46e97b730ba7971fe50608175154b44235504.tar.gz CMake-45a46e97b730ba7971fe50608175154b44235504.tar.bz2 | |
Merge topic 'libuv-idna' into release-3.30
890beb19e6 libuv: backport IDNA input/output hardening fixes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9658
| -rw-r--r-- | Utilities/cmlibuv/src/idna.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Utilities/cmlibuv/src/idna.c b/Utilities/cmlibuv/src/idna.c index 93d982c..858b19d 100644 --- a/Utilities/cmlibuv/src/idna.c +++ b/Utilities/cmlibuv/src/idna.c @@ -274,6 +274,9 @@ 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; @@ -308,8 +311,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. */ } |