Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 652747 - 64-bit Nightly [build 25-04-2011] crashes on launch in DLL Blacklist code with certain antivirus software installed. r=vlad

Browse Source
This commit is contained in:
Makoto Kato 2011-05-08 22:27:50 +09:00
parent a0b59b8e30
commit 57b8801432
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/xre/nsWindowsDllInterceptor.h
View File

@ -185,12 +185,12 @@ protected:
}
}
#elif defined(_M_X64)
int pJmp32 = 0;
int pJmp32 = -1;
while (nBytes < 13) {
// if found JMP 32bit offset, next bytes must be NOP
if (pJmp32) {
if (pJmp32 >= 0) {
if (origBytes[nBytes++] != 0x90)
return 0;
@ -311,7 +311,7 @@ protected:
*((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) {
if (pJmp32 >= 0) {
// convert JMP 32bit offset to JMP 64bit direct
byteptr_t directJmpAddr = origBytes + pJmp32 + 5 + (*((LONG*)(origBytes+pJmp32+1)));
// mov r11, address