[Cmake-commits] CMake branch, next, updated. v2.8.3-1497-g626e8c1

[David Cole]

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  626e8c1250f3758a9bee4681444629b080f006b4 (commit)
       via  b08657cf0fbe2d02d87a866e7c2dfc29f8d80571 (commit)
       via  451c5f61c26fc1db154605dc5e4b1c07d584b24b (commit)
      from  05f0bb86b188aa3381fed65e0f6eb128de9fde0d (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=626e8c1250f3758a9bee4681444629b080f006b4
commit 626e8c1250f3758a9bee4681444629b080f006b4
Merge: 05f0bb8 b08657c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 27 07:18:03 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 27 07:18:03 2011 -0500

    Merge topic 'fix-xcode-generator-crash' into next
    
    b08657c Xcode: Fix crash: avoid strlen call on NULL char *
    451c5f6 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b08657cf0fbe2d02d87a866e7c2dfc29f8d80571
commit b08657cf0fbe2d02d87a866e7c2dfc29f8d80571
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Jan 27 06:57:12 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Jan 27 06:57:12 2011 -0500

    Xcode: Fix crash: avoid strlen call on NULL char *
    
    Thanks to Johan Björk for the report on the CMake mailing list.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1395865..358721f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2693,7 +2693,7 @@ void cmGlobalXCodeGenerator
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
   const char* osxArch =
       this->CurrentMakefile->GetDefinition("CMAKE_OSX_ARCHITECTURES");
-  if(strlen(osxArch) == 0)
+  if(!osxArch || strlen(osxArch) == 0)
     {
     if(this->XcodeVersion >= 32)
       {

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

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


hooks/post-receive
-- 
CMake