glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SA_HANDLER function pointer comparisons for hppa

Browse Source 
* signal.c (sys_sigaction): Cast SA_HANDLER function pointers to long.
(sys_rt_sigaction): Likewise.
This commit is contained in:
Carlos O'Donell 2009-09-09 18:13:19 +00:00 committed by Dmitry V. Levin
parent eeb9ce3895
commit 4677c8af94
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
signal.c
View File

@ -1121,11 +1121,19 @@ struct tcb *tcp;
else if (umove(tcp, addr, &sa) < 0)
tprintf("{...}");
else {
if (sa.SA_HANDLER == SIG_ERR)
/* Architectures using function pointers, like
* hppa, may need to manipulate the function pointer
* to compute the result of a comparison. However,
* the SA_HANDLER function pointer exists only in
* the address space of the traced process, and can't
* be manipulated by strace. In order to prevent the
* compiler from generating code to manipulate
* SA_HANDLER we cast the function pointers to long. */
if ((long)sa.SA_HANDLER == (long)SIG_ERR)
tprintf("{SIG_ERR, ");
else if (sa.SA_HANDLER == SIG_DFL)
else if ((long)sa.SA_HANDLER == (long)SIG_DFL)
tprintf("{SIG_DFL, ");
else if (sa.SA_HANDLER == SIG_IGN) {
else if ((long)sa.SA_HANDLER == (long)SIG_IGN) {
#ifndef USE_PROCFS
if (tcp->u_arg[0] == SIGTRAP) {
tcp->flags |= TCB_SIGTRAPPED;
@ -1931,12 +1939,19 @@ sys_rt_sigaction(struct tcb *tcp)
tprintf("{...}");
goto after_sa;
}
if (sa.__sa_handler == SIG_ERR)
/* Architectures using function pointers, like
* hppa, may need to manipulate the function pointer
* to compute the result of a comparison. However,
* the SA_HANDLER function pointer exists only in
* the address space of the traced process, and can't
* be manipulated by strace. In order to prevent the
* compiler from generating code to manipulate
* SA_HANDLER we cast the function pointers to long. */
if ((long)sa.__sa_handler == (long)SIG_ERR)
tprintf("{SIG_ERR, ");
else if (sa.__sa_handler == SIG_DFL)
else if ((long)sa.__sa_handler == (long)SIG_DFL)
tprintf("{SIG_DFL, ");
else if (sa.__sa_handler == SIG_IGN)
else if ((long)sa.__sa_handler == (long)SIG_IGN)
tprintf("{SIG_IGN, ");
else
tprintf("{%#lx, ", (long) sa.__sa_handler);