Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-21 05:05:48 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix: #4856 #4857 (#6365)

Browse Source
This commit is contained in:
leberus 2016-12-28 16:02:05 +01:00 committed by radare
parent 83c5ab96a9
commit 8b0afcbc39
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libr/core/cmd_debug.c
View File

@ -2948,7 +2948,27 @@ static int cmd_debug_continue (RCore *core, const char *input) {
switch (input[1]) {
case 0: // "dc"
r_reg_arena_swap (core->dbg->reg, true);
#if __linux__
old_pid = core->dbg->pid;
r_debug_continue (core->dbg);
RList *list = core->dbg->h
? core->dbg->h->threads (core->dbg, core->dbg->pid)
: NULL;
if (list) {
RDebugPid *th;
RListIter *it;
r_list_foreach (list, it, th) {
if (th->pid && th->pid != old_pid) {
r_debug_select (core->dbg, th->pid,
core->dbg->tid);
r_debug_continue (core->dbg);
}
}
}
r_debug_select (core->dbg, old_pid, core->dbg->tid);
#else
r_debug_continue (core->dbg);
#endif
break;
case 'a': // "dca"
eprintf ("TODO: dca\n");

12
libr/debug/p/debug_native.c
View File

@ -359,7 +359,7 @@ static RDebugReasonType r_debug_native_wait (RDebug *dbg, int pid) {
int ret = waitpid (-1, &status, WAITPID_FLAGS);
#else
//eprintf ("waiting on pid %d ...\n", pid);
int ret = waitpid (pid, &status, WAITPID_FLAGS);
int ret = waitpid (pid, &status, WAITPID_FLAGS|WNOHANG);
#endif // WAIT_ON_ALL_CHILDREN
if (ret == -1) {
r_sys_perror ("waitpid");
@ -395,12 +395,18 @@ static RDebugReasonType r_debug_native_wait (RDebug *dbg, int pid) {
eprintf ("child received signal %d\n", WTERMSIG (status));
reason = R_DEBUG_REASON_SIGNAL;
} else if (WIFSTOPPED (status)) {
if (WSTOPSIG (status) != SIGTRAP) {
if (WSTOPSIG (status) != SIGTRAP &&
WSTOPSIG (status) != SIGSTOP) {
eprintf ("child stopped with signal %d\n", WSTOPSIG (status));
}
/* this one might be good enough... */
dbg->reason.signum = WSTOPSIG (status);
if (dbg->reason.signum == SIGSTOP) {
eprintf ("delivery\n");
reason = R_DEBUG_REASON_NONE;
goto delivery;
}
/* the ptrace documentation says GETSIGINFO is only necessary for
* differentiating the various stops.
@ -438,7 +444,7 @@ static RDebugReasonType r_debug_native_wait (RDebug *dbg, int pid) {
}
#endif // __APPLE__
#endif // __WINDOWS__ && !__CYGWIN__
delivery:
dbg->reason.tid = pid;
dbg->reason.type = reason;
return reason;

20
libr/debug/p/native/linux/linux_debug.c
View File

@ -195,10 +195,28 @@ bool linux_set_options (RDebug *dbg, int pid) {
int linux_attach (RDebug *dbg, int pid) {
linux_set_options (dbg, pid);
int ret = ptrace (PTRACE_ATTACH, pid, 0, 0);
int ret = ptrace (PTRACE_ATTACH, pid, NULL, NULL);
if (ret != -1) {
perror ("ptrace (PT_ATTACH)");
}
if (dbg->h) {
RList *list = r_list_new ();
if (list) {
list = linux_thread_list (pid, list);
RDebugPid *th;
RListIter *it;
r_list_foreach (list, it, th) {
if (th->pid && th->pid != pid) {
eprintf ("Attaching to pid: %d\n", th->pid);
int ret = ptrace (PTRACE_ATTACH, th->pid, NULL, NULL);
if (ret != -1) {
perror ("ptrace (PT_ATTACH)");
}
}
}
}
}
return pid;
}