maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix DoReadMemory for Windows mini dumps. 

Differential Revision: http://reviews.llvm.org/D15359

llvm-svn: 255083
This commit is contained in:
Adrian McCarthy 2015-12-09 00:29:38 +00:00
parent 000bf49cec
commit 278a6c952b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp
View File

@ -30,6 +30,7 @@
#include "lldb/Target/StopInfo.h" #include "lldb/Target/StopInfo.h"
#include "lldb/Target/Target.h" #include "lldb/Target/Target.h"
#include "lldb/Target/UnixSignals.h" #include "lldb/Target/UnixSignals.h"
#include "lldb/Utility/LLDBAssert.h"
#include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
@ -267,7 +268,9 @@ ProcessWinMiniDump::DoReadMemory(lldb::addr_t addr, void *buf, size_t size, Erro
// There's at least some overlap between the beginning of the desired range // There's at least some overlap between the beginning of the desired range
// (addr) and the current range. Figure out where the overlap begins and // (addr) and the current range. Figure out where the overlap begins and
// how much overlap there is, then copy it to the destination buffer. // how much overlap there is, then copy it to the destination buffer.
const size_t offset = range.start - addr; lldbassert(range.start <= addr);
const size_t offset = addr - range.start;
lldbassert(offset < range.size);
const size_t overlap = std::min(size, range.size - offset); const size_t overlap = std::min(size, range.size - offset);
std::memcpy(buf, range.ptr + offset, overlap); std::memcpy(buf, range.ptr + offset, overlap);
return overlap; return overlap;