[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2478-g057a1c8

[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  057a1c8dca8b66023550c0f39d311f784e75b8d0 (commit)
       via  ab079ee6822c4ab151b0df8f9a529088607d3629 (commit)
      from  ef610df15517b09b8ba8068b081c894636da71ae (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=057a1c8dca8b66023550c0f39d311f784e75b8d0
commit 057a1c8dca8b66023550c0f39d311f784e75b8d0
Merge: ef610df ab079ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 17:28:40 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 12 17:28:40 2013 -0400

    Merge topic 'property-link-depends-no-crash' into next
    
    ab079ee Avoid crash when checking property compatibility without link info


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab079ee6822c4ab151b0df8f9a529088607d3629
commit ab079ee6822c4ab151b0df8f9a529088607d3629
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 17:25:59 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 17:25:59 2013 -0400

    Avoid crash when checking property compatibility without link info
    
    Teach the compatibility check added by commit 042ecf04 (Add API to
    calculate link-interface-dependent bool properties or error, 2013-01-06)
    to return early if no link information is available.  This avoids
    crashing in a case that should fail with an error message.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c8f532e..07da31f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4699,6 +4699,10 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
       || (!impliedByUse && !explicitlySet));
 
   cmComputeLinkInformation *info = tgt->GetLinkInformation(config);
+  if(!info)
+    {
+    return propContent;
+    }
   const cmComputeLinkInformation::ItemVector &deps = info->GetItems();
   bool propInitialized = explicitlySet;
 

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

Summary of changes:
 Source/cmTarget.cxx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake