Merge topic 'fix-xcode-generator-crash'

b08657c Xcode: Fix crash: avoid strlen call on NULL char *
This commit is contained in:
Brad King 2011-01-28 14:17:32 -05:00 committed by CMake Topic Stage
commit aa21763e0c

View File

@ -2693,7 +2693,7 @@ void cmGlobalXCodeGenerator
this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP); this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
const char* osxArch = const char* osxArch =
this->CurrentMakefile->GetDefinition("CMAKE_OSX_ARCHITECTURES"); this->CurrentMakefile->GetDefinition("CMAKE_OSX_ARCHITECTURES");
if(strlen(osxArch) == 0) if(!osxArch || strlen(osxArch) == 0)
{ {
if(this->XcodeVersion >= 32) if(this->XcodeVersion >= 32)
{ {