[Cmake-commits] CMake branch, next, updated. v2.8.3-1574-g3d3c3de

[Alexander Neundorf]

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  3d3c3de64be2502c13b4d2e28a061ee8ba747a0c (commit)
       via  00e7ea76e83153db1f95289a4b101b3031c97b99 (commit)
      from  a3a96c28320204968d2df40bd17702aae26ee4f0 (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=3d3c3de64be2502c13b4d2e28a061ee8ba747a0c
commit 3d3c3de64be2502c13b4d2e28a061ee8ba747a0c
Merge: a3a96c2 00e7ea7
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 4 14:35:01 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 4 14:35:01 2011 -0500

    Merge topic 'FixCrashInGraphVizWriter' into next
    
    00e7ea7 Fix crash in GraphVizWriter when GRAPHVIZ_TARGET_IGNORE_REGEX is used


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00e7ea76e83153db1f95289a4b101b3031c97b99
commit 00e7ea76e83153db1f95289a4b101b3031c97b99
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 4 20:31:18 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Feb 4 20:31:18 2011 +0100

    Fix crash in GraphVizWriter when GRAPHVIZ_TARGET_IGNORE_REGEX is used
    
    GraphVizWriter could crash if GRAPHVIZ_TARGET_IGNORE_REGEX was set.
    Patch from Christian Ehrlicher.
    
    Alex

diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index bdb33bc..de95aa5 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -272,6 +272,12 @@ void cmGraphVizWriter::WriteConnections(const char* targetName,
     std::map<cmStdString, cmStdString>::const_iterator libNameIt =
                                           this->TargetNamesNodes.find(libName);
 
+    // can happen e.g. if GRAPHVIZ_TARGET_IGNORE_REGEX is used
+    if(libNameIt == this->TargetNamesNodes.end())
+      {
+      continue;
+      }
+
     std::string connectionName = myNodeName;
     connectionName += "-";
     connectionName += libNameIt->second;

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

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


hooks/post-receive
-- 
CMake