diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-07-24 13:58:53 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-07-24 13:58:53 -0700 |
| commit | d0cb43af0fc93be73d0e80ac8ce2fe495dba3b9b (patch) | |
| tree | 1dd5a77a5f3ea7fcf5e40ce9caeb8277a353b136 /src/utilcode | |
| parent | 2cf141dce5c3a22efd148e88f8a732835ee68336 (diff) | |
| parent | 8ee888502bb736de1c0e47321881b498cd9335a8 (diff) | |
| download | coreclr-d0cb43af0fc93be73d0e80ac8ce2fe495dba3b9b.tar.gz coreclr-d0cb43af0fc93be73d0e80ac8ce2fe495dba3b9b.tar.bz2 coreclr-d0cb43af0fc93be73d0e80ac8ce2fe495dba3b9b.zip | |
Merge pull request #1283 from dotnet-bot/from-tfs
Merge changes from TFS
Diffstat (limited to 'src/utilcode')
| -rw-r--r-- | src/utilcode/debug.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/utilcode/debug.cpp b/src/utilcode/debug.cpp index d5be6cbc18..33d09fa076 100644 --- a/src/utilcode/debug.cpp +++ b/src/utilcode/debug.cpp @@ -801,11 +801,10 @@ VOID DbgAssertDialog(const char *szFile, int iLine, const char *szExpr) EX_TRY { FAULT_NOT_FATAL(); + szExprToDisplay = &g_szExprWithStack2[0]; strcpy(szExprToDisplay, szExpr); - _ASSERTE(szExprToDisplay == g_szExprWithStack2); strcat_s(szExprToDisplay, _countof(g_szExprWithStack2), "\n\n"); GetStringFromStackLevels(1, 10, szExprToDisplay + strlen(szExprToDisplay)); - szExprToDisplay = &g_szExprWithStack2[0]; fGotStackTrace = TRUE; } EX_CATCH |