Commit 786065d5 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r316106: 

------------------------------------------------------------------------
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.
------------------------------------------------------------------------

llvm-svn: 319035
parent 3f76a35b

lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)