Fixing a logic flaw with NSURL summary. This was caught by running the test suite in 32bit mode
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@174778 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/DataFormatters/CXXFormatterFunctions.cpp b/source/DataFormatters/CXXFormatterFunctions.cpp
index 1edb458..d03d761 100644
--- a/source/DataFormatters/CXXFormatterFunctions.cpp
+++ b/source/DataFormatters/CXXFormatterFunctions.cpp
@@ -1085,20 +1085,20 @@
ClangASTType type(valobj.GetClangAST(),valobj.GetClangType());
ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset_text, type, true));
ValueObjectSP base(valobj.GetSyntheticChildAtOffset(offset_base, type, true));
- if (!text || !base)
+ if (!text)
return false;
if (text->GetValueAsUnsigned(0) == 0)
return false;
StreamString summary;
if (!NSStringSummaryProvider(*text, summary))
return false;
- if (base->GetValueAsUnsigned(0))
+ if (base && base->GetValueAsUnsigned(0))
{
if (summary.GetSize() > 0)
summary.GetString().resize(summary.GetSize()-1);
summary.Printf(" -- ");
StreamString base_summary;
- if (NSStringSummaryProvider(*base, base_summary) && base_summary.GetSize() > 0)
+ if (NSURLSummaryProvider(*base, base_summary) && base_summary.GetSize() > 0)
summary.Printf("%s",base_summary.GetSize() > 2 ? base_summary.GetData() + 2 : base_summary.GetData());
}
if (summary.GetSize())