From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- xpcom/base/nsDebugImpl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xpcom/base/nsDebugImpl.cpp') diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp index 4023efd0ec..81305ccdb9 100644 --- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -452,13 +452,12 @@ NS_DebugBreak(uint32_t aSeverity, const char* aStr, const char* aExpr, if (XRE_IsParentProcess()) { // Don't include the PID in the crash report annotation to // allow faceting on crash-stats.mozilla.org. - nsCString note("xpcom_runtime_abort("); + nsAutoCString note("xpcom_runtime_abort("); note += nonPIDBuf.buffer; note += ")"; CrashReporter::AppendAppNotesToCrashReport(note); - CrashReporter::AnnotateCrashReport( - CrashReporter::Annotation::AbortMessage, - nsDependentCString(nonPIDBuf.buffer)); + CrashReporter::RecordAnnotationNSCString( + CrashReporter::Annotation::AbortMessage, note); } #if defined(DEBUG) && defined(_WIN32) -- cgit v1.2.3