Skip to content

Commit

Permalink
[corlib]: Fix race condition in ExceptionDispatchInfo. (#5279)
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Baulig authored and marek-safar committed Oct 13, 2017
1 parent b21ae3e commit 38da0b3
Showing 1 changed file with 3 additions and 2 deletions.
Expand Up @@ -47,10 +47,11 @@ private ExceptionDispatchInfo(Exception exception)
// 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;
Expand Down

0 comments on commit 38da0b3

Please sign in to comment.