mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

MHD_add_connection(): added more checks for correct members of sockaddr

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2023-11-16 17:05:32 +03:00
parent bfa7c5a10c
commit 050c641bde
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/daemon.c
+31
View File
@@ -3599,6 +3599,19 @@ MHD_add_connection (struct MHD_Daemon *daemon,
#endif /* HAVE_MESSAGES */
return MHD_NO;
}
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
if ((0 != addr->sa_len) &&
(sizeof(struct sockaddr_in) > (size_t) addr->sa_len) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_ ("MHD_add_connection() has been called with " \
"non-zero value of 'sa_len' member of " \
"'struct sockaddr' which does not match 'sa_family'.\n"));
#endif /* HAVE_MESSAGES */
return MHD_NO;
}
#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
}
#ifdef HAVE_INET6
if (AF_INET6 == addr->sa_family)
@@ -3612,7 +3625,25 @@ MHD_add_connection (struct MHD_Daemon *daemon,
#endif /* HAVE_MESSAGES */
return MHD_NO;
}
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
if ((0 != addr->sa_len) &&
(sizeof(struct sockaddr_in6) > (size_t) addr->sa_len) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_ ("MHD_add_connection() has been called with " \
"non-zero value of 'sa_len' member of " \
"'struct sockaddr' which does not match 'sa_family'.\n"));
#endif /* HAVE_MESSAGES */
return MHD_NO;
}
#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
}
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
if ((0 != addr->sa_len) &&
(addrlen > addr->sa_len))
addrlen = (socklen_t) addr->sa_len; /* Use safest value */
#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
#endif /* HAVE_INET6 */
}