Skip to content

Fix crash related to unwind protect short circuiting #245

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

Merged
jimhester merged 1 commit into from
Nov 1, 2021
Merged

Fix crash related to unwind protect short circuiting #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# cpp11 (development version)

* Fix crash related to unwind protect optimization (#244)

# cpp11 0.4.0

## New Features
Expand Down
11 changes: 5 additions & 6 deletions inst/include/cpp11/protect.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ inline Rboolean& get_should_unwind_protect() {
return should_unwind_protect[0];
}

static Rboolean& should_unwind_protect = get_should_unwind_protect();

} // namespace detail

#ifdef HAS_UNWIND_PROTECT
Expand All @@ -82,11 +80,12 @@ static Rboolean& should_unwind_protect = get_should_unwind_protect();
template <typename Fun, typename = typename std::enable_if<std::is_same<
decltype(std::declval<Fun&&>()()), SEXP>::value>::type>
SEXP unwind_protect(Fun&& code) {
if (detail::should_unwind_protect == FALSE) {
static auto should_unwind_protect = detail::get_should_unwind_protect();
if (should_unwind_protect == FALSE) {
return std::forward<Fun>(code)();
}

detail::should_unwind_protect = FALSE;
should_unwind_protect = FALSE;

static SEXP token = [] {
SEXP res = R_MakeUnwindCont();
Expand All @@ -96,7 +95,7 @@ SEXP unwind_protect(Fun&& code) {

std::jmp_buf jmpbuf;
if (setjmp(jmpbuf)) {
detail::should_unwind_protect = TRUE;
should_unwind_protect = TRUE;
throw unwind_exception(token);
}

Expand All @@ -121,7 +120,7 @@ SEXP unwind_protect(Fun&& code) {
// unset it here before returning the value ourselves.
SETCAR(token, R_NilValue);

detail::should_unwind_protect = TRUE;
should_unwind_protect = TRUE;

return res;
}
Expand Down