diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2017-10-13 21:07:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 21:07:22 +0300 |
| commit | c6605763a36adbdffafcdc95721531e9679a6d95 (patch) | |
| tree | 14ecc5e3dcf9545a676bc28ece3b0d6f6ad819da | |
| parent | fea2566b12d8c62c87f8dbc42893efdd166d56ac (diff) | |
| parent | 0fb4040ef169d9587a2553ca072f59b8d1c8195f (diff) | |
Merge pull request #5783 from marek-safar/2017-06-fixesmono-5.4.1.4
[corlib]: Fix race condition in ExceptionDispatchInfo. (#5279)
| -rw-r--r-- | mcs/class/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs | 5 |
1 files 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; |