Skip to content

Fix crash in install_bad_alloc_error_handler #83160

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
aganea merged 3 commits into from
Mar 1, 2024
Merged

Fix crash in install_bad_alloc_error_handler #83160

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27c72eb
fix: Make the assert in install_bad_alloc_error_handler reference the…
fabianbs96 Feb 27, 2024
00382c1
Add minimal test to catch potential unwanted interaction in fatal/bad…
fabianbs96 Feb 27, 2024
c6a8545
Apply review comments
fabianbs96 Feb 28, 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
3 changes: 2 additions & 1 deletion llvm/lib/Support/ErrorHandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
#if LLVM_ENABLE_THREADS == 1
std::lock_guard<std::mutex> Lock(BadAllocErrorHandlerMutex);
#endif
assert(!ErrorHandler && "Bad alloc error handler already registered!\n");
assert(!BadAllocErrorHandler &&
"Bad alloc error handler already registered!\n");
BadAllocErrorHandler = handler;
BadAllocErrorHandlerUserData = user_data;
}
Expand Down
22 changes: 22 additions & 0 deletions llvm/unittests/Support/ErrorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,4 +1132,26 @@ TEST(Error, moveInto) {
}
}

TEST(Error, FatalBadAllocErrorHandlersInteraction) {
auto ErrorHandler = [](void *Data, const char *, bool) {};
install_fatal_error_handler(ErrorHandler, nullptr);
// The following call should not crash
Copy link
Member

@aganea aganea Feb 28, 2024

Choose a reason for hiding this comment

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

I think you should expand just a little more your comment, just to explain we're doing this sequence of calls because of a bug that happened previously inside install_bad_alloc_error_handler.

install_bad_alloc_error_handler(ErrorHandler, nullptr);

// Don't interfere with other tests:
Copy link
Member

@aganea aganea Feb 28, 2024

Choose a reason for hiding this comment

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

Remove : and finish with a full stop (.)

remove_fatal_error_handler();
remove_bad_alloc_error_handler();
}

TEST(Error, BadAllocFatalErrorHandlersInteraction) {
auto ErrorHandler = [](void *Data, const char *, bool) {};
install_bad_alloc_error_handler(ErrorHandler, nullptr);
// The following call should not crash
install_fatal_error_handler(ErrorHandler, nullptr);

// Don't interfere with other tests:
remove_fatal_error_handler();
remove_bad_alloc_error_handler();
}

} // namespace