diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-27 19:30:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-27 19:30:42 +0000 |
| commit | 91d03645d394edb89e6cf6c074ed5e3765de770e (patch) | |
| tree | 40bd3106fa49c8759e3e3d5848dd92958bf0bdae /main/acl.c | |
| parent | 649179b952b9bf55a46f74dda63af04de2c92ce4 (diff) | |
Merged revisions 111443 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r111443 | tilghman | 2008-03-27 14:26:45 -0500 (Thu, 27 Mar 2008) | 14 lines
Merged revisions 111442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r111442 | tilghman | 2008-03-27 14:23:12 -0500 (Thu, 27 Mar 2008) | 6 lines
For FreeBSD, at least, the ifa_addr element could be NULL.
(closes issue #12300)
Reported by: festr
Patches:
acl.c.patch uploaded by festr (license 443)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@111444 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/acl.c')
| -rw-r--r-- | main/acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/acl.c b/main/acl.c index 22248648f..9a141a373 100644 --- a/main/acl.c +++ b/main/acl.c @@ -144,7 +144,7 @@ static int get_local_address(struct in_addr *ourip) #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) { - if (ifap->ifa_addr->sa_family == AF_INET) { + if (ifap->ifa_addr && ifap->ifa_addr->sa_family == AF_INET) { sin = (const struct sockaddr_in *) ifap->ifa_addr; score_address(sin, &best_addr, &best_score); res = 0; |