Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 653361 - Dll Block list doesn't work when Avast! Anti-Virus is installed. r=vlad

Browse Source
This commit is contained in:
Makoto Kato 2011-08-20 00:34:28 +09:00
parent 0fee531cc8
commit 398cf82b27
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toolkit/xre/nsWindowsDllInterceptor.h
View File

@ -189,6 +189,7 @@ protected:
int nBytes = 0;
#if defined(_M_IX86)
int nJmp32 = -1;
while (nBytes < 5) {
// Understand some simple instructions that might be found in a
// prologue; we might need to extend this as necessary.
@ -216,6 +217,11 @@ protected:
} else if (origBytes[nBytes] == 0x6A) {
// PUSH imm8
nBytes += 2;
} else if (origBytes[nBytes] == 0xe9) {
// JMP rel32
nJmp32 = nBytes;
// jmp 32bit offset
nBytes += 5;
} else {
//printf ("Unknown x86 instruction byte 0x%02x, aborting trampoline\n", origBytes[nBytes]);
return 0;
@ -349,8 +355,16 @@ protected:
byteptr_t trampDest = origBytes + nBytes;
#if defined(_M_IX86)
tramp[nBytes] = 0xE9; // jmp
*((intptr_t*)(tramp+nBytes+1)) = (intptr_t)trampDest - (intptr_t)(tramp+nBytes+5); // target displacement
if (nJmp32 >= 0) {
// Function entry has JMP rel32. We replace with correct target address.
byteptr_t targetAddress =
origBytes + nJmp32 + 5 + (*((LONG*)(origBytes+nJmp32+1)));
*((intptr_t*)(tramp+nJmp32+1)) =
(intptr_t)targetAddress - (intptr_t)(tramp+nJmp32+5);
} else {
tramp[nBytes] = 0xE9; // jmp
*((intptr_t*)(tramp+nBytes+1)) = (intptr_t)trampDest - (intptr_t)(tramp+nBytes+5); // target displacement
}
#elif defined(_M_X64)
// If JMP32 opcode found, we don't insert to trampoline jump
if (pJmp32 >= 0) {