Ensure input is XML decoded (#104)

Author: arvindshmicrosoft

Engine/StackResolver.cs

@@ -76,8 +76,7 @@ private string ResolveSymbols(Dictionary<string, DiaUtil> _diautils, Dictionary<
             int runningFrameNum = int.MinValue;
             foreach (var iterFrame in callStackLines) {
                 if (cts.IsCancellationRequested) { StatusMessage = OperationCanceled; PercentComplete = 0; return OperationCanceled; }
-                // hard-coded find-replace for XML markup - useful when importing from XML histograms
-                var currentFrame = iterFrame.Replace("&lt;", "<").Replace("&gt;", ">");
+                var currentFrame = iterFrame;
                 if (relookupSource && includeSourceInfo) {
                     // This is a rare case. Sometimes we get frames which are already resolved to their symbols but do not include source and line number information
                     // take for example     sqldk.dll!SpinlockBase::Sleep+0x2d0
@@ -428,6 +427,8 @@ public async Task<string> ResolveCallstacksAsync(List<StackDetails> listOfCallSt
         /// <returns>List of StackDetails objects</returns>
         public async Task<List<StackDetails>> GetListofCallStacksAsync(string inputCallstackText, bool framesOnSingleLine, CancellationTokenSource cts) {
             return await Task.Run(() => {
+                this.StatusMessage = "Decoding any encoded XML input...";
+                inputCallstackText = System.Net.WebUtility.HtmlDecode(inputCallstackText);
                 this.StatusMessage = "Analyzing input...";
                 if (Regex.IsMatch(inputCallstackText, @"<HistogramTarget(\s+|\>)") && inputCallstackText.Contains(@"</HistogramTarget>")) {
                     var numHistogramTargets = Regex.Matches(inputCallstackText, @"\<\/HistogramTarget\>").Count;

Tests/Tests.cs

@@ -640,6 +640,9 @@ private string PrepareLargeXEventInput() {
             var ret = await csr.ResolveCallstacksAsync(await csr.GetListofCallStacksAsync(input, true, cts), pdbPath, false, null, true, false, false, true, false, false, null, cts);
             var expected = "Slot_0	[count:5]:\r\n\r\nsqldk!XeSosPkg::spinlock_backoff::Publish+425\r\nsqldk!SpinlockBase::Sleep+182\r\nsqlmin!Spinlock<143,7,1>::SpinToAcquireWithExponentialBackoff+363\r\nsqlmin!lck_lockInternal+2042";
             Assert.AreEqual(expected.Trim(), ret.Trim());
+            input = "&lt;HistogramTarget truncated=\"0\" buckets=\"256\"&gt;&lt;Slot count=\"5\"&gt;&lt;value&gt;0x00007FFEABD0D919        0x00007FFEABC4D45D      0x00007FFEAC0F7EE0  0x00007FFEAC0F80CF  &lt;/value&gt;&lt;/Slot&gt;&lt;/HistogramTarget&gt;";
+            ret = await csr.ResolveCallstacksAsync(await csr.GetListofCallStacksAsync(input, true, cts), pdbPath, false, null, true, false, false, true, false, false, null, cts);
+            Assert.AreEqual(expected.Trim(), ret.Trim());
         }
 
         [TestMethod][TestCategory("Unit")] public async Task E2ESymSrvXMLFramesMultiHistogram() {