[svn-commits] tilghman: branch 1.6.0 r111444 - in /branches/1.6.0: ./ main/acl.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Mar 27 14:30:42 2008
New Revision: 111444

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111444
Log:
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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/acl.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/acl.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/acl.c?view=diff&rev=111444&r1=111443&r2=111444
==============================================================================
--- branches/1.6.0/main/acl.c (original)
+++ branches/1.6.0/main/acl.c Thu Mar 27 14:30:42 2008
@@ -144,7 +144,7 @@
 #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;