x64dbg
/
TitanEngine
mirror of https://github.com/x64dbg/TitanEngine
1
0
Fork 0
Code Releases Activity

fixed a bug with the breakpoint filters

This commit is contained in:
mr.exodia 2014-04-20 18:00:54 +02:00
parent 1ec5796e36
commit c6d15d788e
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
TitanEngine/Global.Breakpoints.cpp
View File

@ -124,13 +124,18 @@ void BreakPointPostReadFilter(ULONG_PTR lpBaseAddress, unsigned char* lpBuffer,
if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT)) if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT))
continue; continue;
ULONG_PTR cur_addr=curBp->BreakPointAddress; ULONG_PTR cur_addr=curBp->BreakPointAddress;
if(cur_addr>=start && cur_addr<end) //breakpoint is in range for(int j=0; j<curBp->BreakPointSize; j++)
{ {
ULONG_PTR index=cur_addr-start; //calculate where to write in the buffer if(cur_addr+j==start && cur_addr+j<end) //breakpoint is in range
int n=curBp->BreakPointSize; {
ULONG_PTR index=cur_addr+j-start; //calculate where to write in the buffer
int n=curBp->BreakPointSize-j;
if((cur_addr+n)>end) if((cur_addr+n)>end)
n=end-cur_addr; //do not overflow the buffer n=end-cur_addr; //do not overflow the buffer
memcpy(lpBuffer+index, curBp->OriginalByte, n); memcpy(lpBuffer+index, &curBp->OriginalByte[j], n);
if(n==curBp->BreakPointSize)
break;
}
} }
} }
} }
@ -147,12 +152,16 @@ void BreakPointPreWriteFilter(ULONG_PTR lpBaseAddress, SIZE_T nSize, MutexLocker
if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT)) if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT))
continue; continue;
ULONG_PTR cur_addr=curBp->BreakPointAddress; ULONG_PTR cur_addr=curBp->BreakPointAddress;
if(cur_addr>=start && cur_addr<end) //breakpoint is in range for(int j=0; j<curBp->BreakPointSize; j++)
{
if(cur_addr+j==start && cur_addr+j<end) //breakpoint byte is in range
{ {
lock->unlock(); lock->unlock();
DisableBPX(cur_addr); //needs a cleaner solution DisableBPX(cur_addr);
lock->relock(); lock->relock();
curBp->BreakPointActive = UE_BPXACTIVE; //little hack curBp->BreakPointActive = UE_BPXACTIVE; //little hack
break;
}
} }
} }
} }
@ -169,12 +178,16 @@ void BreakPointPostWriteFilter(ULONG_PTR lpBaseAddress, SIZE_T nSize, MutexLocke
if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT)) if(curBp->BreakPointActive != UE_BPXACTIVE || (curBp->BreakPointType != UE_BREAKPOINT && curBp->BreakPointType != UE_SINGLESHOOT))
continue; continue;
ULONG_PTR cur_addr=curBp->BreakPointAddress; ULONG_PTR cur_addr=curBp->BreakPointAddress;
if(cur_addr>=start && cur_addr<end) //breakpoint is in range for(int j=0; j<curBp->BreakPointSize; j++)
{
if(cur_addr+j==start && cur_addr+j<end) //breakpoint byte is in range
{ {
curBp->BreakPointActive = UE_BPXINACTIVE; //little hack curBp->BreakPointActive = UE_BPXINACTIVE; //little hack
lock->unlock(); lock->unlock();
EnableBPX(cur_addr); //needs a cleaner solution EnableBPX(cur_addr); //needs a cleaner solution
lock->relock(); lock->relock();
break;
}
} }
} }
} }