diff options
author | Mike McLaughlin <mikem@microsoft.com> | 2015-07-07 15:14:15 -0700 |
---|---|---|
committer | Mike McLaughlin <mikem@microsoft.com> | 2015-07-08 09:48:54 -0700 |
commit | b9755fd81cb477087934a685b0820495e68b7c2f (patch) | |
tree | 36b47c7aeb1f58dd0ede7167ea53e49fd7dd1d10 /src/inc/winwrap.h | |
parent | 6ddbc71bfcfa87df7b203808bbd62323aa4dfdaf (diff) | |
download | coreclr-b9755fd81cb477087934a685b0820495e68b7c2f.tar.gz coreclr-b9755fd81cb477087934a685b0820495e68b7c2f.tar.bz2 coreclr-b9755fd81cb477087934a685b0820495e68b7c2f.zip |
Fix recursive asserts in coreclr.
Remove assert in VM break handler to prevent recursive asserts. Fixed problem where the DebugBreak wasn't terminating the app on an assert causing double assert messages. Restoring the SIGTRAP handler and returning was continuing the DebugBreak not terminating. Replaced this with an abort().
Cleanup the assert message formatting.
Diffstat (limited to 'src/inc/winwrap.h')
-rw-r--r-- | src/inc/winwrap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/inc/winwrap.h b/src/inc/winwrap.h index 3c0b5751c0..65a8e6c2d0 100644 --- a/src/inc/winwrap.h +++ b/src/inc/winwrap.h @@ -943,7 +943,9 @@ inline void DbgWPrintf(const LPCWSTR wszFormat, ...) va_end(args); if (IsDebuggerPresent()) + { OutputDebugStringW(wszBuffer); + } else { fwprintf(stdout, W("%s"), wszBuffer); |