aboutsummaryrefslogtreecommitdiff
path: root/lldb/source/DataFormatters/StringPrinter.cpp
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2015-07-17 01:56:25 +0000
committerEnrico Granata <egranata@apple.com>2015-07-17 01:56:25 +0000
commit8101f570f83cf7643b64d38d71dfe00cea3ac6ee (patch)
treeaf8e7a3f80cf58e1ed3bf70dd0ece8ca81681c45 /lldb/source/DataFormatters/StringPrinter.cpp
parent2d8315f8066bbce201e9b2c28b7d24915dcbe5f0 (diff)
downloadllvm-8101f570f83cf7643b64d38d71dfe00cea3ac6ee.zip
llvm-8101f570f83cf7643b64d38d71dfe00cea3ac6ee.tar.gz
llvm-8101f570f83cf7643b64d38d71dfe00cea3ac6ee.tar.bz2
Teach the std::wstring data formatter how to properly display strings with embedded NUL bytes
llvm-svn: 242501
Diffstat (limited to 'lldb/source/DataFormatters/StringPrinter.cpp')
-rw-r--r--lldb/source/DataFormatters/StringPrinter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lldb/source/DataFormatters/StringPrinter.cpp b/lldb/source/DataFormatters/StringPrinter.cpp
index 60c246f..27f5b51 100644
--- a/lldb/source/DataFormatters/StringPrinter.cpp
+++ b/lldb/source/DataFormatters/StringPrinter.cpp
@@ -382,6 +382,8 @@ DumpUTFBufferToStream (ConversionResult (*ConvertFunction) (const SourceDataType
utf8_data_ptr = (UTF8*)utf8_data_buffer_sp->GetBytes();
utf8_data_end_ptr = utf8_data_ptr + utf8_data_buffer_sp->GetByteSize();
ConvertFunction ( &data_ptr, data_end_ptr, &utf8_data_ptr, utf8_data_end_ptr, lenientConversion );
+ if (false == zero_is_terminator)
+ utf8_data_end_ptr = utf8_data_ptr;
utf8_data_ptr = (UTF8*)utf8_data_buffer_sp->GetBytes(); // needed because the ConvertFunction will change the value of the data_ptr
}
else