Commit 140d71113 for clamav.net
commit 140d7111335df5a3f3e52c629a0ce90aecfe6446
Author: GitHubArchive\Val S. <218006698+val-ms@users.noreply.github.com>
Date: Fri Nov 20 18:56:42 2026 -0500
libclamav: Fix URL canonicalization buffer bounds
Limit copied URL lengths to the destination capacity and preserve the
reserved terminator space.
After skipping leading slash and dot characters, base subsequent length
calculations on the actual hostname so path separation cannot move data
outside the stack buffer.
CLAM-3064
diff --git a/libclamav/phishcheck.c b/libclamav/phishcheck.c
index b9d8084a6..fdef3f3ee 100644
--- a/libclamav/phishcheck.c
+++ b/libclamav/phishcheck.c
@@ -1225,13 +1225,20 @@ enum phish_status cli_url_canon(const char* inurl, size_t len, char* urlbuff, si
{
char *url, *p, *last;
char *host_begin, *path_begin;
- const char* urlend = urlbuff + len;
+ const char* urlend;
size_t host_len, path_len;
+ if (dest_len < 3)
+ return CL_PHISH_CLEAN;
+
dest_len -= 3;
- strncpy(urlbuff, inurl, dest_len);
- urlbuff[dest_len] = urlbuff[dest_len + 1] = urlbuff[dest_len + 2] = '\0';
- url = urlbuff;
+ if (len > dest_len)
+ len = dest_len;
+
+ memcpy(urlbuff, inurl, len);
+ urlbuff[len] = urlbuff[len + 1] = urlbuff[len + 2] = '\0';
+ urlend = urlbuff + len;
+ url = urlbuff;
/* canonicalize only real URLs, with a protocol */
host_begin = strchr(url, ':');
@@ -1252,7 +1259,9 @@ enum phish_status cli_url_canon(const char* inurl, size_t len, char* urlbuff, si
len = urlend - url;
/* skip to beginning of hostname */
while ((host_begin < urlend) && *host_begin == '/') ++host_begin;
- while (*host_begin == '.' && host_begin < urlend) ++host_begin;
+ while ((host_begin < urlend) && *host_begin == '.') ++host_begin;
+ url = host_begin;
+ len = urlend - url;
last = strchr(host_begin, '/');
p = host_begin;