From 8468153145bea7cfb6c6e376383a494710fcd1da Mon Sep 17 00:00:00 2001
From: Mike McLaughlin <mikem@microsoft.com>
Date: Wed, 22 Jul 2015 14:01:57 -0700
Subject: Fix recursive assert in utilcode/debug.cpp when VM code, etc. hits an
 assert.

The fix was to rearrange the code so the assert isn't necessary and removed it. Fixes TFS bug 1199569.

[tfs-changeset: 1504713]
---
 src/utilcode/debug.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/utilcode')

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
-- 
cgit v1.2.3