storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix crash on interface list walk with IP-less interfaces. (Thanks Jan Kiszka)

Browse Source
This commit is contained in:
Justin Maggard 2011-11-02 07:07:39 +00:00
parent 2e502913ee
commit 713fd03ddc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
getifaddr.c
View File

@ -93,12 +93,12 @@ getifaddr(const char * ifname, char * buf, int len)
} }
for( p = ifap; p != NULL; p = p->ifa_next ) for( p = ifap; p != NULL; p = p->ifa_next )
{ {
if( p->ifa_addr->sa_family == AF_INET ) if( p->ifa_addr && p->ifa_addr->sa_family == AF_INET )
{ {
if( strcmp(p->ifa_name, ifname) != 0 ) if( strcmp(p->ifa_name, ifname) != 0 )
continue; continue;
addr_in = (struct sockaddr_in *)p->ifa_addr; addr_in = (struct sockaddr_in *)p->ifa_addr;
if(!inet_ntop(AF_INET, &addr_in->sin_addr, buf, len)) if( !inet_ntop(AF_INET, &addr_in->sin_addr, buf, len) )
{ {
DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno));
break; break;
@ -176,13 +176,13 @@ getsysaddr(char * buf, int len)
} }
for( p = ifap; p != NULL; p = p->ifa_next ) for( p = ifap; p != NULL; p = p->ifa_next )
{ {
if (p->ifa_addr->sa_family == AF_INET) if( p->ifa_addr && p->ifa_addr->sa_family == AF_INET )
{ {
addr_in = (struct sockaddr_in *)p->ifa_addr; addr_in = (struct sockaddr_in *)p->ifa_addr;
a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF; a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF;
if( a == 127 ) if( a == 127 )
continue; continue;
if(!inet_ntop(AF_INET, &addr_in->sin_addr, buf, len)) if( !inet_ntop(AF_INET, &addr_in->sin_addr, buf, len) )
{ {
DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno));
break; break;
@ -250,7 +250,7 @@ getsyshwaddr(char * buf, int len)
} }
for( p = ifap; p != NULL; p = p->ifa_next ) for( p = ifap; p != NULL; p = p->ifa_next )
{ {
if (p->ifa_addr->sa_family == AF_LINK) if( p->ifa_addr && p->ifa_addr->sa_family == AF_LINK )
{ {
addr_in = (struct sockaddr_in *)p->ifa_addr; addr_in = (struct sockaddr_in *)p->ifa_addr;
a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF; a = (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF;