[Bug libstdc++/90682] std::terminate() will happily call a null terminate handler
redi at gcc dot gnu.org
gcc-bugzilla@gcc.gnu.org
Fri May 31 10:35:00 GMT 2019
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90682
--- Comment #4 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Fri May 31 10:35:11 2019
New Revision: 271808
URL: https://gcc.gnu.org/viewcvs?rev=271808&root=gcc&view=rev
Log:
PR libstdc++/90682 allow set_terminate(0) and set_unexpected(0)
Make these functions restore the default handlers when passed a null
pointer. This is consistent with std::pmr::set_default_resource(0), and
also matches the current behaviour of libc++.
In order to avoid duplicating the preprocessor condition from
eh_term_handler.cc more that into a new eh_term_handler.h header and
define a macro that can be used in both eh_term_handler.cc and
eh_terminate.cc.
PR libstdc++/90682
* libsupc++/eh_term_handler.cc: Include eh_term_handler.h to get
definition of _GLIBCXX_DEFAULT_TERM_HANDLER.
* libsupc++/eh_term_handler.h: New header defining
_GLIBCXX_DEFAULT_TERM_HANDLER.
* libsupc++/eh_terminate.cc: Include eh_term_handler.h.
(set_terminate): Restore default handler when argument is null.
(set_unexpected): Likewise.
* testsuite/18_support/set_terminate.cc: New test.
* testsuite/18_support/set_unexpected.cc: New test.
Added:
trunk/libstdc++-v3/libsupc++/eh_term_handler.h
- copied, changed from r271807,
trunk/libstdc++-v3/libsupc++/eh_term_handler.cc
trunk/libstdc++-v3/testsuite/18_support/set_terminate.cc
trunk/libstdc++-v3/testsuite/18_support/set_unexpected.cc
Modified:
trunk/libstdc++-v3/ChangeLog
trunk/libstdc++-v3/libsupc++/eh_term_handler.cc
trunk/libstdc++-v3/libsupc++/eh_terminate.cc
More information about the Gcc-bugs
mailing list