[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4151-gcc8c8ec

[Stephen Kelly]

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  cc8c8ec925cf3f0cae69ab0a4649b0620489e2c7 (commit)
       via  b78d07e6daf9218de9208a32e1a64d64f9ba730c (commit)
      from  c7c9333159d3f6c398b3db20250bb2914ade2739 (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=cc8c8ec925cf3f0cae69ab0a4649b0620489e2c7
commit cc8c8ec925cf3f0cae69ab0a4649b0620489e2c7
Merge: c7c9333 b78d07e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 11:16:01 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 12 11:16:01 2013 -0400

    Merge topic 'print-CMP0022-content-conflict' into next
    
    b78d07e Fix possible reason for 'Invalid read of size 8' errors.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b78d07e6daf9218de9208a32e1a64d64f9ba730c
commit b78d07e6daf9218de9208a32e1a64d64f9ba730c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 17:12:42 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 12 17:12:42 2013 +0200

    Fix possible reason for 'Invalid read of size 8' errors.
    
    The string could be null at this point.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ce0d0f2..ac655da 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6449,7 +6449,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
             << newExplicitLibraries
             << "\n"
             << linkIfaceProp << ":\n  "
-            << explicitLibraries << "\n";
+            << (explicitLibraries ? explicitLibraries : "(empty)") << "\n";
           this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
           }
           // Fall through

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

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


hooks/post-receive
-- 
CMake