This patch introduces a new method to SBData: SetDataWithOwnership.
Instead of referencing the pointer to the data, this method copies the
data buffer into lldb's heap memory.
This can prevent having the underlying DataExtractor object point to
freed/garbage-collected memory.
Differential Revision: https://reviews.llvm.org/D115652
Signed-off-by: Med Ismail Bennani <medismail.bennani@gmail.com>
void
SetData (lldb::SBError& error, const void *buf, size_t size, lldb::ByteOrder endian, uint8_t addr_size);
+ void
+ SetDataWithOwnership (lldb::SBError& error, const void *buf, size_t size,
+ lldb::ByteOrder endian, uint8_t addr_size);
+
bool
Append (const SBData& rhs);
void SetData(lldb::SBError &error, const void *buf, size_t size,
lldb::ByteOrder endian, uint8_t addr_size);
+ void SetDataWithOwnership(lldb::SBError &error, const void *buf, size_t size,
+ lldb::ByteOrder endian, uint8_t addr_size);
+
// see SetData() for why we don't have Append(const void* buf, size_t size)
bool Append(const SBData &rhs);
}
}
+void SBData::SetDataWithOwnership(lldb::SBError &error, const void *buf,
+ size_t size, lldb::ByteOrder endian,
+ uint8_t addr_size) {
+ LLDB_RECORD_DUMMY(
+ void, SBData, SetData,
+ (lldb::SBError &, const void *, size_t, lldb::ByteOrder, uint8_t, bool),
+ error, buf, size, endian, addr_size, copy);
+
+ lldb::DataBufferSP buffer_sp = std::make_shared<DataBufferHeap>(buf, size);
+
+ if (!m_opaque_sp.get())
+ m_opaque_sp = std::make_shared<DataExtractor>(buf, size, endian, addr_size);
+ else {
+ m_opaque_sp->SetData(buffer_sp);
+ m_opaque_sp->SetByteOrder(endian);
+ m_opaque_sp->SetAddressByteSize(addr_size);
+ }
+}
+
bool SBData::Append(const SBData &rhs) {
LLDB_RECORD_METHOD(bool, SBData, Append, (const lldb::SBData &), rhs);
addr = data.GetAddress(error, 0)
self.assertEqual(addr, 0x8877665544332211);
+ def test_byte_order_and_address_byte_size_with_ownership(self):
+ """Test the SBData::SetDataWithOwnership() to ensure the byte order
+ and address byte size are obeyed even when source date is released"""
+ addr_data = b'\x11\x22\x33\x44\x55\x66\x77\x88'
+ error = lldb.SBError()
+ data = lldb.SBData()
+ data.SetDataWithOwnership(error, addr_data, lldb.eByteOrderBig, 8)
+ del addr_data
+ addr = data.GetAddress(error, 0)
+ self.assertEqual(addr, 0x1122334455667788);
+
def test_with_run_command(self):
"""Test the SBData APIs."""
self.build()