Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-21 12:48:36 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed breakpoint infinete loop error (#10410)

Browse Source
This commit is contained in:
vdf-git 2018-06-19 15:34:10 +02:00 committed by radare
parent 2153021aea
commit b643095d1f
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libr/debug/debug.c
View File

@ -93,6 +93,40 @@ static int r_debug_bp_hit(RDebug *dbg, RRegItem *pc_ri, ut64 pc, RBreakpointItem
# else
int pc_off = dbg->bpsize;
/* see if we really have a breakpoint here... */
if (!dbg->pc_at_bp_set) {
b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
if (!b) { /* we don't. nothing left to do */
/* Some targets set pc to breakpoint */
b = r_bp_get_at (dbg->bp, pc);
if (!b) {
/* Couldn't find the break point. Nothing more to do... */
return true;
}
else {
dbg->pc_at_bp_set = true;
dbg->pc_at_bp = true;
}
} else {
dbg->pc_at_bp_set = true;
dbg->pc_at_bp = false;
}
}
if (!dbg->pc_at_bp_set) {
eprintf ("failed to determine position of pc after breakpoint");
}
if (dbg->pc_at_bp) {
pc_off = 0;
b = r_bp_get_at (dbg->bp, pc);
} else {
b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
}
if (!b) {
return true;
}
b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
if (!b) { /* we don't. nothing left to do */
/* Some targets set pc to breakpoint */

3
libr/include/r_debug.h
View File

@ -298,6 +298,9 @@ typedef struct r_debug_t {
struct r_debug_plugin_t *h;
RList *plugins;
bool pc_at_bp; /* after a breakpoint, is the pc at the bp? */
bool pc_at_bp_set; /* is the pc_at_bp variable set already? */
RAnal *anal;
RList *maps; // <RDebugMap>
RList *maps_user; // <RDebugMap>