commit 23ab35aed2796f62462d725281bc2d57370dc539
author Enrico Granata <egranata@apple.com> Tue Apr 02 23:07:55 2013 +0000
committer Enrico Granata <egranata@apple.com> Tue Apr 02 23:07:55 2013 +0000
tree 760968e750349f6023d27c9a2fc08710deede112
parent e2fbc67e8171cc4a479e172ab422c6b3b31cff7b

Fixing a silly bug that would cause string summaries not to show up :-)

llvm-svn: 178590

lldb/source/DataFormatters/CXXFormatterFunctions.cpp

diff --git a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
index 54c51f5..072649d 100644
--- a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
+++ b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
@@ -271,7 +271,11 @@
     if (origin_encoding != 8 && !ConvertFunction)
         return false;
 
-    sourceSize = std::min(sourceSize,process_sp->GetTarget().GetMaximumSizeOfStringSummary());
+    if (!sourceSize)
+        sourceSize = process_sp->GetTarget().GetMaximumSizeOfStringSummary();
+    else
+        sourceSize = std::min(sourceSize,process_sp->GetTarget().GetMaximumSizeOfStringSummary());
+    
     const int bufferSPSize = sourceSize * (origin_encoding >> 2);
 
     Error error;
@@ -654,7 +658,10 @@
     if (!process_sp || location == 0)
         return false;
     
-    size = std::min(size,process_sp->GetTarget().GetMaximumSizeOfStringSummary());
+    if (!size)
+        size = process_sp->GetTarget().GetMaximumSizeOfStringSummary();
+    else
+        size = std::min(size,process_sp->GetTarget().GetMaximumSizeOfStringSummary());
     
     lldb::DataBufferSP buffer_sp(new DataBufferHeap(size,0));