mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1049275 - Don't use IPC for crash reporting after NS_ABORT (r=bsmedberg)
This commit is contained in:
parent
f7f6759423
commit
ef86b29514
@ -15,6 +15,7 @@
|
|||||||
# include "nsExceptionHandler.h"
|
# include "nsExceptionHandler.h"
|
||||||
#endif
|
#endif
|
||||||
#include "nsString.h"
|
#include "nsString.h"
|
||||||
|
#include "nsXULAppAPI.h"
|
||||||
#include "prprf.h"
|
#include "prprf.h"
|
||||||
#include "prlog.h"
|
#include "prlog.h"
|
||||||
#include "nsError.h"
|
#include "nsError.h"
|
||||||
@ -413,12 +414,17 @@ NS_DebugBreak(uint32_t aSeverity, const char* aStr, const char* aExpr,
|
|||||||
|
|
||||||
case NS_DEBUG_ABORT: {
|
case NS_DEBUG_ABORT: {
|
||||||
#if defined(MOZ_CRASHREPORTER)
|
#if defined(MOZ_CRASHREPORTER)
|
||||||
nsCString note("xpcom_runtime_abort(");
|
// Updating crash annotations in the child causes us to do IPC. This can
|
||||||
note += buf.buffer;
|
// really cause trouble if we're asserting from within IPC code. So we
|
||||||
note += ")";
|
// have to do without the annotations in that case.
|
||||||
CrashReporter::AppendAppNotesToCrashReport(note);
|
if (XRE_GetProcessType() == GeckoProcessType_Default) {
|
||||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AbortMessage"),
|
nsCString note("xpcom_runtime_abort(");
|
||||||
nsDependentCString(buf.buffer));
|
note += buf.buffer;
|
||||||
|
note += ")";
|
||||||
|
CrashReporter::AppendAppNotesToCrashReport(note);
|
||||||
|
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AbortMessage"),
|
||||||
|
nsDependentCString(buf.buffer));
|
||||||
|
}
|
||||||
#endif // MOZ_CRASHREPORTER
|
#endif // MOZ_CRASHREPORTER
|
||||||
|
|
||||||
#if defined(DEBUG) && defined(_WIN32)
|
#if defined(DEBUG) && defined(_WIN32)
|
||||||
|
Loading…
Reference in New Issue
Block a user