Skip to content

Commit 20e4252

Browse files
committed
[win/asan] GetInstructionSize: Remove duplicate instruction FF 25 ....
It appears already some lines above with this comment: "Cannot overwrite control-instruction. Return 0 to indicate failure.". Replacing just the comment in the first appearance.
1 parent 47ef5c4 commit 20e4252

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

compiler-rt/lib/interception/interception_win.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
631631
return 2;
632632

633633
// Cannot overwrite control-instruction. Return 0 to indicate failure.
634-
case 0x25FF: // FF 25 XX XX XX XX : jmp [XXXXXXXX]
634+
case 0x25FF: // FF 25 XX YY ZZ WW : jmp dword ptr ds:[WWZZYYXX]
635635
return 0;
636636
}
637637

@@ -864,7 +864,6 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
864864
case 0x75FF: // FF 75 XX : push dword ptr [ebp + XX]
865865
return 3;
866866
case 0xC1F7: // F7 C1 XX YY ZZ WW : test ecx, WWZZYYXX
867-
case 0x25FF: // FF 25 XX YY ZZ WW : jmp dword ptr ds:[WWZZYYXX]
868867
return 6;
869868
case 0x3D83: // 83 3D XX YY ZZ WW TT : cmp TT, WWZZYYXX
870869
return 7;

0 commit comments

Comments
 (0)