Merge pull request #1395 from dorian-apanel-intel/review/cmdparsergen_updateStrings_fix

brianrob · web-flow · commit 6b4771eecba5 · 2021-03-23T07:36:14.000-07:00
TraceParserGen: Exception in UpdateStrings()
diff --git a/src/TraceParserGen/ETWManifest.cs b/src/TraceParserGen/ETWManifest.cs
@@ -919,7 +919,11 @@ internal void UpdateStrings(Dictionary<string, string> stringMap)
             }
 
             m_stringsLookedUp = true;
-            foreach (var key in m_values.Keys)
+
+            int[] keys = new int[m_values.Keys.Count];
+            m_values.Keys.CopyTo(keys, 0);
+
+            foreach (var key in keys)
             {
                 var value = m_values[key];
                 if (Provider.Replace(ref value, stringMap))

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,11 @@ internal void UpdateStrings(Dictionary<string, string> stringMap)`
`919`	`919`	`}`
`920`	`920`
`921`	`921`	`m_stringsLookedUp = true;`
`922`		`- foreach (var key in m_values.Keys)`
	`922`	`+`
	`923`	`+ int[] keys = new int[m_values.Keys.Count];`
	`924`	`+ m_values.Keys.CopyTo(keys, 0);`
	`925`	`+`
	`926`	`+ foreach (var key in keys)`
`923`	`927`	`{`
`924`	`928`	`var value = m_values[key];`
`925`	`929`	`if (Provider.Replace(ref value, stringMap))`