[Cmake-commits] CMake branch, next, updated. v2.8.10.1-831-gc9bce4e

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c9bce4e3c898c0d69bc0b6d94bc74d20a7bc5f97 (commit)
       via  1acc689665f1420d01bd5325acd15b1903703647 (commit)
       via  4cf44d3621487415d5c2ccc5628c5e0c99119410 (commit)
       via  ce761e123b8206f3b737a36fe9cbac61ead62a6b (commit)
       via  c31e119d246e06fd5cc8d4cbc50b8e0d78c852a0 (commit)
      from  2abac23c53fa4ad74d04bbdd8399097096aa9992 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9bce4e3c898c0d69bc0b6d94bc74d20a7bc5f97
commit c9bce4e3c898c0d69bc0b6d94bc74d20a7bc5f97
Merge: 2abac23 1acc689
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 9 08:26:57 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 9 08:26:57 2012 -0500

    Merge topic 'update-KWSys' into next
    
    1acc689 Merge branch 'upstream-kwsys' into update-KWSys
    4cf44d3 KWSys 2012-11-08 (3b17de34)
    ce761e1 CMake Nightly Date Stamp
    c31e119 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1acc689665f1420d01bd5325acd15b1903703647
commit 1acc689665f1420d01bd5325acd15b1903703647
Merge: ce761e1 4cf44d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 9 08:24:08 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 9 08:24:08 2012 -0500

    Merge branch 'upstream-kwsys' into update-KWSys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cf44d3621487415d5c2ccc5628c5e0c99119410
commit 4cf44d3621487415d5c2ccc5628c5e0c99119410
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Nov 8 08:40:56 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 9 08:24:03 2012 -0500

    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

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'};

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake          |    2 +-
 Source/kwsys/SystemInformation.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake