robotux
/
pstack
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix incorrect ptrace failure tests in crawl()

This commit is contained in:
Thomas Preud'homme 2011-10-02 23:50:22 +02:00
parent 3ce8c91fd9
commit 6f25ab2494
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pstack.c
View File

@ -645,7 +645,7 @@ static int crawl(int pid)
errno = 0; errno = 0;
ret = ptrace(PTRACE_GETREGS, pid, NULL, &regs); ret = ptrace(PTRACE_GETREGS, pid, NULL, &regs);
if (ret != -1 && !errno) { if (ret != -1) {
pc = PROGRAM_COUNTER(regs); pc = PROGRAM_COUNTER(regs);
fp = FRAME_POINTER(regs); fp = FRAME_POINTER(regs);
} }
@ -656,7 +656,7 @@ static int crawl(int pid)
print_pc(pc); print_pc(pc);
for ( ; !error_occured && fp; ) { for ( ; !error_occured && fp; ) {
nextfp = ptrace(PTRACE_PEEKDATA, pid, NEXT_FRAME_POINTER_ADDR(fp), 0); nextfp = ptrace(PTRACE_PEEKDATA, pid, NEXT_FRAME_POINTER_ADDR(fp), 0);
if (nextfp == (unsigned) -1 && errno) { if (nextfp == (unsigned long) -1 && errno) {
error_occured = 1; error_occured = 1;
break; break;
} }
@ -667,7 +667,7 @@ static int crawl(int pid)
fputs(" (", stdout); fputs(" (", stdout);
for (i = 1; i <= nargs; i++) { for (i = 1; i <= nargs; i++) {
arg = ptrace(PTRACE_PEEKDATA, pid, ARG_NMBR(fp,i), 0); arg = ptrace(PTRACE_PEEKDATA, pid, ARG_NMBR(fp,i), 0);
if (arg == (unsigned) -1 && errno) { if (arg == (unsigned long) -1 && errno) {
error_occured = 1; error_occured = 1;
break; break;
} }
@ -682,7 +682,7 @@ static int crawl(int pid)
if (error_occured || !nextfp) break; if (error_occured || !nextfp) break;
pc = ptrace(PTRACE_PEEKDATA, pid, NEXT_PROGRAM_COUNTER_ADDR(fp), 0); pc = ptrace(PTRACE_PEEKDATA, pid, NEXT_PROGRAM_COUNTER_ADDR(fp), 0);
if (pc == (unsigned) -1 && errno) { if (pc == (unsigned long) -1 && errno) {
error_occured = 1; error_occured = 1;
break; break;
} }
@ -729,6 +729,7 @@ void usage(const char *argv0, const char *param)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i; int i;
long thePidTmp;
const char *argv0 = argv[0]; const char *argv0 = argv[0];
/* Arrange to detach if we get an unexpected signal. This prevents /* Arrange to detach if we get an unexpected signal. This prevents
@ -741,10 +742,11 @@ int main(int argc, char **argv)
for (argc--, argv++; argc > 0; argc--, argv++) { for (argc--, argv++; argc > 0; argc--, argv++) {
char *endptr = NULL; char *endptr = NULL;
thePid = strtol(*argv, &endptr, 0); thePidTmp = strtol(*argv, &endptr, 0);
if (!*argv || *endptr || (errno == ERANGE && if (!*argv || *endptr || (errno == ERANGE &&
(thePid == LONG_MIN || thePid == LONG_MAX))) (thePidTmp == LONG_MIN || thePidTmp == LONG_MAX)))
usage(argv0, *argv); usage(argv0, *argv);
thePid = thePidTmp;
if (!thePid || thePid == getpid()) { if (!thePid || thePid == getpid()) {
fprintf(stderr, "Invalid PID %d\n", thePid); fprintf(stderr, "Invalid PID %d\n", thePid);
continue; continue;