diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-28 19:17:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-28 19:17:32 (GMT) |
| commit | aa21763e0caec11d7b6df0eac5fe828eb95059d1 (patch) | |
| tree | 8354c2c503bfe832afd39ca2e5f017bac3149056 /Source | |
| parent | 7c4e57c82132158edf226c5ca57c4f7a8a976c5a (diff) | |
| parent | b08657cf0fbe2d02d87a866e7c2dfc29f8d80571 (diff) | |
| download | CMake-aa21763e0caec11d7b6df0eac5fe828eb95059d1.zip CMake-aa21763e0caec11d7b6df0eac5fe828eb95059d1.tar.gz CMake-aa21763e0caec11d7b6df0eac5fe828eb95059d1.tar.bz2 | |
Merge topic 'fix-xcode-generator-crash'
b08657c Xcode: Fix crash: avoid strlen call on NULL char *
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |