Author: amccarth Date: Tue Dec 8 18:29:38 2015 New Revision: 255083 URL: http://llvm.org/viewvc/llvm-project?rev=255083&view=rev Log: Fix DoReadMemory for Windows mini dumps.
Differential Revision: http://reviews.llvm.org/D15359 Modified: lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp Modified: lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp?rev=255083&r1=255082&r2=255083&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp Tue Dec 8 18:29:38 2015 @@ -30,6 +30,7 @@ #include "lldb/Target/StopInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/UnixSignals.h" +#include "lldb/Utility/LLDBAssert.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/Format.h" #include "llvm/Support/raw_ostream.h" @@ -267,7 +268,9 @@ ProcessWinMiniDump::DoReadMemory(lldb::a // 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 // 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); std::memcpy(buf, range.ptr + offset, overlap); return overlap; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
