[Lldb-commits] [lldb] r178590 - Fixing a silly bug that would cause string summaries not to show up :-)

[Enrico Granata]

Author: enrico
Date: Tue Apr  2 18:07:55 2013
New Revision: 178590

URL: http://llvm.org/viewvc/llvm-project?rev=178590&view=rev
Log:
Fixing a silly bug that would cause string summaries not to show up :-)

Modified:
    lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp

Modified: lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp?rev=178590&r1=178589&r2=178590&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp (original)
+++ lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp Tue Apr  2 18:07:55 2013
@@ -271,7 +271,11 @@ ReadUTFBufferAndDumpToStream (Conversion
     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 @@ ReadAsciiBufferAndDumpToStream (lldb::ad
     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));