Index: courgette/disassembler_elf_32.cc |
diff --git a/courgette/disassembler_elf_32.cc b/courgette/disassembler_elf_32.cc |
index fc4c3793c0fb08a53a3bba42794ea7b00c6c7ed4..b16f31d6b6d79881c1f44fe7b743b0ed80190379 100644 |
--- a/courgette/disassembler_elf_32.cc |
+++ b/courgette/disassembler_elf_32.cc |
@@ -408,14 +408,13 @@ CheckBool DisassemblerElf32::ParseSimpleRegion( |
const uint8* start = OffsetToPointer(start_file_offset); |
const uint8* end = OffsetToPointer(end_file_offset); |
+ const ptrdiff_t len = end - start; // Works because vars are byte pointers |
- const uint8* p = start; |
+ // Callers don't guarantee start < end |
dgarrett
2013/08/12 21:55:21
I'd probably move this before the len calculation,
|
+ if (start >= end) return true; |
- while (p < end) { |
- if (!program->EmitByteInstruction(*p)) |
- return false; |
- ++p; |
- } |
+ if (!program->EmitBytesInstruction(start, len)) |
+ return false; |
return true; |
} |