diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -1138,15 +1138,16 @@ if (load_addr == LLDB_INVALID_ADDRESS && so_addr.IsSectionOffset()) { uint8_t addr_bytes[8]; + size_t buf_size = sizeof(addr_bytes); Status error; if (target && - target->ReadMemory(so_addr, &addr_bytes, size, error, - /*force_live_memory=*/false) == size) { + target->ReadMemory(so_addr, &addr_bytes, buf_size, error, + /*force_live_memory=*/false) == buf_size) { ObjectFile *objfile = module_sp->GetObjectFile(); stack.back().GetScalar() = DerefSizeExtractDataHelper( - addr_bytes, size, objfile->GetByteOrder(), size); + addr_bytes, size, objfile->GetByteOrder(), buf_size); stack.back().ClearContext(); break; } else { @@ -1170,13 +1171,13 @@ lldb::addr_t pointer_addr = stack.back().GetScalar().ULongLong(LLDB_INVALID_ADDRESS); uint8_t addr_bytes[sizeof(lldb::addr_t)]; + size_t buf_size = sizeof(addr_bytes); Status error; - if (process->ReadMemory(pointer_addr, &addr_bytes, size, error) == - size) { - + if (process->ReadMemory(pointer_addr, &addr_bytes, buf_size, error) + == buf_size) { stack.back().GetScalar() = DerefSizeExtractDataHelper(addr_bytes, sizeof(addr_bytes), - process->GetByteOrder(), size); + process->GetByteOrder(), buf_size); stack.back().ClearContext(); } else { if (error_ptr)