Fixing a logic flaw with NSURL summary. This was caught by running the test suite...

llvm-svn: 174778

diff --git a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
index 1edb458ecbf4f323a1d3a517b205db58352b558e..d03d76156a0f1098f07a12cb7aaac3dd1a8ff4c4 100644 (file)
--- a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
+++ b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
@@ -1085,20 +1085,20 @@ lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream& str
         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())