From 0fb4040ef169d9587a2553ca072f59b8d1c8195f Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Mon, 31 Jul 2017 13:01:41 -0400 Subject: [corlib]: Fix race condition in ExceptionDispatchInfo. (#5279) --- .../system/runtime/exceptionservices/exceptionservicescommon.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mcs/class/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs b/mcs/class/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs index 77ffc4c02c8..7d31bda158c 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs @@ -47,10 +47,11 @@ namespace System.Runtime.ExceptionServices { // Copy over the details we need to save. m_Exception = exception; #if MONO - var count = exception.captured_traces == null ? 0 : exception.captured_traces.Length; + var traces = exception.captured_traces; + var count = traces == null ? 0 : traces.Length; var stack_traces = new System.Diagnostics.StackTrace [count + 1]; if (count != 0) - Array.Copy (exception.captured_traces, 0, stack_traces, 0, count); + Array.Copy (traces, 0, stack_traces, 0, count); stack_traces [count] = new System.Diagnostics.StackTrace (exception, 0, true); m_stackTrace = stack_traces; -- cgit v1.2.3