diff options
| -rw-r--r-- | lldb/source/DataFormatters/StringPrinter.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py | 2 | ||||
| -rw-r--r-- | lldb/test/lang/cpp/wchar_t/main.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/DataFormatters/StringPrinter.cpp b/lldb/source/DataFormatters/StringPrinter.cpp index be08cf2750a..52d03fc7379 100644 --- a/lldb/source/DataFormatters/StringPrinter.cpp +++ b/lldb/source/DataFormatters/StringPrinter.cpp @@ -566,7 +566,7 @@ ReadUTFBufferAndDumpToStream (const ReadStringAndDumpToStreamOptions& options, else data_read = process_sp->ReadMemoryFromInferior(options.GetLocation(), (char*)buffer_sp->GetBytes(), bufferSPSize, error); - if (error.Fail() || data_read == 0) + if (error.Fail()) { options.GetStream()->Printf("unable to read data"); return true; diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py index bade12d9f3b..10804c1eca2 100644 --- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py +++ b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py @@ -73,6 +73,8 @@ class CxxWCharTTestCase(TestBase): self.expect("frame variable mazeltov", substrs = ['(const wchar_t *) mazeltov = ','L"מזל טוב"']) + self.expect("frame variable ws_NULL",substrs = ['(wchar_t *) ws_NULL = 0x0']) + self.expect("frame variable ws_empty",substrs = [' L""']) if __name__ == '__main__': import atexit diff --git a/lldb/test/lang/cpp/wchar_t/main.cpp b/lldb/test/lang/cpp/wchar_t/main.cpp index 6e533b5acfe..258c1c155cc 100644 --- a/lldb/test/lang/cpp/wchar_t/main.cpp +++ b/lldb/test/lang/cpp/wchar_t/main.cpp @@ -24,5 +24,7 @@ int main (int argc, char const *argv[]) Foo<int> foo_x('a'); Foo<wchar_t> foo_y(L'a'); const wchar_t *mazeltov = L"מזל טוב"; + wchar_t *ws_NULL = nullptr; + wchar_t *ws_empty = L""; return 0; // Set break point at this line. } |
