christoph/fail
1
Fork 0
Code Releases Activity

util: LLVM disassembler off-by-one

Browse Source 
The disassembled memory region's end (variable "End") is exclusive
now.  Up to now, the two branches defining this variable disagreed on
inclusiveness, leading to an infinite loop in one case.

Change-Id: I055fc240f6ec2f4a1d1937e48617c86612cff5c5
This commit is contained in:
Horst Schirmeier
2014-06-25 16:43:28 +02:00
parent b60e1c0c66
commit e73ac88d1b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/util/llvmdisassembler/LLVMDisassembler.cpp
View File

@ -82,7 +82,7 @@ void LLVMDisassembler::disassemble()
// Disassemble symbol by symbol.
for (unsigned si = 0, se = Symbols.size(); si != se; ++si) {
uint64_t Start = Symbols[si].first;
uint64_t End;
uint64_t End; // exclusive
// The end is either the size of the section or the beginning of the next
// symbol.
if (Start >= SectSize)
@ -92,12 +92,12 @@ void LLVMDisassembler::disassemble()
End = SectSize;
// Make sure this symbol takes up space.
else if (Symbols[si + 1].first != Start)
End = Symbols[si + 1].first - 1;
End = Symbols[si + 1].first;
else
// This symbol has the same address as the next symbol. Skip it.
continue;
for (Index = Start; Index <= End; Index += Size) {
for (Index = Start; Index < End; Index += Size) {
MCInst Inst;
if (disas->getInstruction(Inst, Size, memoryObject, Index,