mirror/darkhttpd
1
0
Fork 0
mirror of https://github.com/emikulic/darkhttpd.git synced 2023-08-10 21:13:08 +03:00
Code Issues Projects Releases Wiki Activity

Fix IPv6 memory corruption crash on FreeBSD.

Browse Source 
getsockname() into addrin6 instead of addrin when ipv6 is requested.
This commit is contained in:
Emil Mikulic 2016-01-28 01:03:38 +11:00
parent 485ebd1a20
commit 15eda67214
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
darkhttpd.c
View File

@ -889,6 +889,10 @@ static void init_sockin(void) {
err(1, "bind(port %u)", bindport); err(1, "bind(port %u)", bindport);
addrin_len = sizeof(addrin6); addrin_len = sizeof(addrin6);
if (getsockname(sockin, (struct sockaddr *)&addrin6, &addrin_len) == -1)
err(1, "getsockname()");
printf("listening on: http://[%s]:%u/\n",
get_address_text(&addrin6.sin6_addr), bindport);
} else } else
#endif #endif
{ {
@ -897,20 +901,9 @@ static void init_sockin(void) {
if (bind(sockin, (struct sockaddr *)&addrin, if (bind(sockin, (struct sockaddr *)&addrin,
sizeof(struct sockaddr_in)) == -1) sizeof(struct sockaddr_in)) == -1)
err(1, "bind(port %u)", bindport); err(1, "bind(port %u)", bindport);
addrin_len = sizeof(addrin); addrin_len = sizeof(addrin);
} if (getsockname(sockin, (struct sockaddr *)&addrin, &addrin_len) == -1)
err(1, "getsockname()");
if (getsockname(sockin, (struct sockaddr *)&addrin, &addrin_len) == -1)
err(1, "getsockname()");
#ifdef HAVE_INET6
if (inet6) {
printf("listening on: http://[%s]:%u/\n",
get_address_text(&addrin6.sin6_addr), bindport);
} else
#endif
{
printf("listening on: http://%s:%u/\n", printf("listening on: http://%s:%u/\n",
get_address_text(&addrin.sin_addr), bindport); get_address_text(&addrin.sin_addr), bindport);
} }