Skip to content

ext/pcntl: adding SIGTRAP handling for freebsd. #14266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

ext/pcntl: adding SIGTRAP handling for freebsd. #14266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bde999
ext/pcntl: adding SIGTRAP handling for freebsd.
devnexen May 18, 2024
8a8c761
si_syscall only when signal code is TRAP_CAP
devnexen May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ext/pcntl/pcntl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,20 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi
add_assoc_long_ex(user_siginfo, "fd", sizeof("fd")-1, siginfo->si_fd);
# endif
break;
#endif

#ifdef SIGTRAP
case SIGTRAP:
# if defined(si_syscall) && defined(__FreeBSD__)
if (siginfo->si_code == TRAP_CAP) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have FreeBSD, and I have no idea what our lowest supported version is, but is this TRAP_CAP constant old enough that it won't cause build failures on older FreeBSD's that we support?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK TRAP_CAP appeared before the si_syscall shortcut.

add_assoc_long_ex(user_siginfo, "syscall", sizeof("syscall")-1, (zend_long)siginfo->si_syscall);
} else {
add_assoc_long_ex(user_siginfo, "trapno", sizeof("trapno")-1, (zend_long)siginfo->si_trapno);
}

# endif
break;

#endif
}
#if defined(SIGRTMIN) && defined(SIGRTMAX)
Expand Down
Loading