ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-04-09 20:11:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #98 from daztucker/master

Browse Source 
In AddrsMatch, keep copies of addrinfos to free.
This commit is contained in:
Bryan Stansell 2024-02-17 10:52:28 -08:00 committed by GitHub
commit 47c232b881
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conserver/consent.c
View File

@ -1308,7 +1308,7 @@ AddrsMatch(char *addr1, char *addr2)
{
#if USE_IPV6
int error, ret = 0;
struct addrinfo *ai1, *ai2, hints;
struct addrinfo *ai1, *ai2, *rp1, *rp2, hints;
#else
/* so, since we might use inet_addr, we're going to use
* (in_addr_t)(-1) as a sign of an invalid ip address.
@ -1346,17 +1346,19 @@ AddrsMatch(char *addr1, char *addr2)
goto done;
}
for (; ai1 != NULL; ai1 = ai1->ai_next) {
for (; ai2 != NULL; ai2 = ai2->ai_next) {
if (ai1->ai_addr->sa_family != ai2->ai_addr->sa_family)
rp1 = ai1;
rp2 = ai2;
for (; rp1 != NULL; rp1 = rp1->ai_next) {
for (; rp2 != NULL; rp2 = rp2->ai_next) {
if (rp1->ai_addr->sa_family != rp2->ai_addr->sa_family)
continue;
if (
# if HAVE_MEMCMP
memcmp(&ai1->ai_addr, &ai2->ai_addr,
memcmp(&rp1->ai_addr, &rp2->ai_addr,
sizeof(struct sockaddr_storage))
# else
bcmp(&ai1->ai_addr, &ai2->ai_addr,
bcmp(&rp1->ai_addr, &rp2->ai_addr,
sizeof(struct sockaddr_storage))
# endif
== 0) {