summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Robot <kwrobot@kitware.com>2012-11-08 13:40:56 (GMT)
committerBrad King <brad.king@kitware.com>2012-11-09 13:24:03 (GMT)
commit4cf44d3621487415d5c2ccc5628c5e0c99119410 (patch)
treeeb75dce37c6b39fb4dcc644cace617b1808d88cb
parentcd83da97a7fdea239033dbe55a1da5ae0a3ae13c (diff)
downloadCMake-4cf44d3621487415d5c2ccc5628c5e0c99119410.zip
CMake-4cf44d3621487415d5c2ccc5628c5e0c99119410.tar.gz
CMake-4cf44d3621487415d5c2ccc5628c5e0c99119410.tar.bz2
KWSys 2012-11-08 (3b17de34)
Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 3b17de34 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' df32fa6f..3b17de34 Brad King (1): 3b17de34 SystemInformation: Do not dereference NULL ifa_addr Change-Id: I2aecf9978d1f66ed021f47620d176a3837bc2ea3
-rw-r--r--SystemInformation.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 6b63b94..6d990a9 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1323,7 +1323,7 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName(
for (ifa=ifas; ifa!=NULL; ifa=ifa->ifa_next)
{
- int fam=ifa->ifa_addr->sa_family;
+ int fam = ifa->ifa_addr? ifa->ifa_addr->sa_family : -1;
if ((fam==AF_INET) || (fam==AF_INET6))
{
char host[NI_MAXHOST]={'\0'};