diff options
| author | Tom Stellard <tstellar@redhat.com> | 2017-11-27 15:22:38 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-11-27 15:22:38 +0000 |
| commit | c9b520a36641d09f00c7ee079353a1af19e4c707 (patch) | |
| tree | 9ceb5302c6478237af933a7969718f41fdb34503 | |
| parent | 04e00a97617c7342f953a939f2cba11a59071cea (diff) | |
Merging r316106:release_50
------------------------------------------------------------------------
r316106 | labath | 2017-10-18 11:52:16 -0700 (Wed, 18 Oct 2017) | 4 lines
lldb-server tests: Fix undefined behavior
We were creating a StringRef pointing to a temporary string. Problem manifested
itself when running the test on osx.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/lldb/branches/release_50@319035 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/tools/lldb-server/tests/MessageObjects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittests/tools/lldb-server/tests/MessageObjects.cpp b/unittests/tools/lldb-server/tests/MessageObjects.cpp index 9fcb42076..6ac067bce 100644 --- a/unittests/tools/lldb-server/tests/MessageObjects.cpp +++ b/unittests/tools/lldb-server/tests/MessageObjects.cpp @@ -67,8 +67,8 @@ StringRef ThreadInfo::ReadRegister(unsigned int register_id) const { bool ThreadInfo::ReadRegisterAsUint64(unsigned int register_id, uint64_t &value) const { - StringRef value_str(m_registers.lookup(register_id)); - if (value_str.getAsInteger(16, value)) { + std::string value_str(m_registers.lookup(register_id)); + if (!llvm::to_integer(value_str, value, 16)) { GTEST_LOG_(ERROR) << formatv("ThreadInfo: Unable to parse register value at {0}.", register_id) |