courgette/disassembler_elf_32_x86.cc - Issue 8501023: Fix two pointer arithmetic errors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: courgette/disassembler_elf_32_x86.cc

Issue 8501023: Fix two pointer arithmetic errors. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: courgette/disassembler_elf_32_x86.cc

diff --git a/courgette/disassembler_elf_32_x86.cc b/courgette/disassembler_elf_32_x86.cc

index 5f3ba959b4276da5093f57df5cb764b83deb01b2..6b61b8358e40b529553c00c8b045e5451c855075 100644

--- a/courgette/disassembler_elf_32_x86.cc

+++ b/courgette/disassembler_elf_32_x86.cc

@@ -567,7 +567,7 @@ CheckBool DisassemblerElf32X86::ParseRel32RelocsFromSection(

// addressing mode?

const uint8* rel32 = NULL;

- if (p + 5 < end_pointer) {

+ if (p + 5 <= end_pointer) {

if (*p == 0xE8 || *p == 0xE9) { // jmp rel32 and call rel32

rel32 = p + 1;

}

@@ -589,7 +589,7 @@ CheckBool DisassemblerElf32X86::ParseRel32RelocsFromSection(

#if COURGETTE_HISTOGRAM_TARGETS

++rel32_target_rvas_[target_rva];

#endif

- p += 4;

+ p = rel32 + 4;

continue;

}