From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.hazardy.de (mail.hazardy.de [78.94.181.132]) by sourceware.org (Postfix) with ESMTPS id B67A23858CDB for ; Tue, 29 Nov 2022 21:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B67A23858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=hazardy.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hazardy.de Received: from [10.0.1.129] (hades.hazardy.de [10.0.1.129]) by mail.hazardy.de (Postfix) with ESMTPSA id 616D270050C for ; Tue, 29 Nov 2022 22:48:13 +0100 (CET) Message-ID: <776a72a7-a6b8-3bd2-d758-821c70420ed9@hazardy.de> Date: Tue, 29 Nov 2022 22:48:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Fwd: [PATCH] libstdc++: Add error handler for References: <20221129214107.25572-1-gcc@hazardy.de> Content-Language: de-DE To: gcc-patches@gcc.gnu.org From: =?UTF-8?Q?Bj=c3=b6rn_Sch=c3=a4pers?= In-Reply-To: <20221129214107.25572-1-gcc@hazardy.de> X-Forwarded-Message-Id: <20221129214107.25572-1-gcc@hazardy.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: -------- Weitergeleitete Nachricht -------- Betreff: [PATCH] libstdc++: Add error handler for Datum: Tue, 29 Nov 2022 22:41:07 +0100 Von: Björn Schäpers An: gcc-patches@gc.gnu.org, libstdc++@gcc.gnu.org From: Björn Schäpers Not providing an error handler results in a nullpointer dereference when an error occurs. libstdc++-v3/ChangeLog * include/std/stacktrace: Add __backtrace_error_handler and use it in all calls to libbacktrace. --- libstdc++-v3/include/std/stacktrace | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace index e7cbbee5638..b786441cbad 100644 --- a/libstdc++-v3/include/std/stacktrace +++ b/libstdc++-v3/include/std/stacktrace @@ -85,6 +85,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_stacktrace 202011L + inline void + __backtrace_error_handler(void*, const char*, int) {} + // [stacktrace.entry], class stacktrace_entry class stacktrace_entry { @@ -159,7 +162,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _S_init() { static __glibcxx_backtrace_state* __state - = __glibcxx_backtrace_create_state(nullptr, 1, nullptr, nullptr); + = __glibcxx_backtrace_create_state(nullptr, 1, + __backtrace_error_handler, nullptr); return __state; } @@ -192,7 +196,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __function != nullptr; }; const auto __state = _S_init(); - if (::__glibcxx_backtrace_pcinfo(__state, _M_pc, +__cb, nullptr, &__data)) + if (::__glibcxx_backtrace_pcinfo(__state, _M_pc, +__cb, + __backtrace_error_handler, &__data)) return true; if (__desc && __desc->empty()) { @@ -201,8 +206,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__symname) *static_cast<_Data*>(__data)->_M_desc = _S_demangle(__symname); }; - if (::__glibcxx_backtrace_syminfo(__state, _M_pc, +__cb2, nullptr, - &__data)) + if (::__glibcxx_backtrace_syminfo(__state, _M_pc, +__cb2, + __backtrace_error_handler, &__data)) return true; } return false; @@ -252,7 +257,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (auto __cb = __ret._M_prepare()) [[likely]] { auto __state = stacktrace_entry::_S_init(); - if (__glibcxx_backtrace_simple(__state, 1, __cb, nullptr, + if (__glibcxx_backtrace_simple(__state, 1, __cb, + __backtrace_error_handler, std::__addressof(__ret))) __ret._M_clear(); } @@ -270,7 +276,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (auto __cb = __ret._M_prepare()) [[likely]] { auto __state = stacktrace_entry::_S_init(); - if (__glibcxx_backtrace_simple(__state, __skip + 1, __cb, nullptr, + if (__glibcxx_backtrace_simple(__state, __skip + 1, __cb, + __backtrace_error_handler, std::__addressof(__ret))) __ret._M_clear(); } @@ -294,7 +301,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { auto __state = stacktrace_entry::_S_init(); int __err = __glibcxx_backtrace_simple(__state, __skip + 1, __cb, - nullptr, + __backtrace_error_handler, std::__addressof(__ret)); if (__err < 0) __ret._M_clear(); -- 2.38.1