diff options
| -rw-r--r-- | lldb/source/DataFormatters/CXXFormatterFunctions.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp index 54c51f532bf..072649d9431 100644 --- a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp +++ b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp @@ -271,7 +271,11 @@ ReadUTFBufferAndDumpToStream (ConversionResult (*ConvertFunction) (const SourceD 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::addr_t location, 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)); |
