Added locks.

Author: KN4CK3R

AddressParser/Interpreter.cs

@@ -21,9 +21,7 @@ public IntPtr Execute(Operation operation, RemoteProcess process)
 			}
 			else if (operation is ModuleOffsetOperation)
 			{
-				var module = process.Modules
-					.Where(m => m.Name.Equals(((ModuleOffsetOperation)operation).Name, StringComparison.InvariantCultureIgnoreCase))
-					.FirstOrDefault();
+				var module = process.GetModuleByName(((ModuleOffsetOperation)operation).Name);
 				if (module != null)
 				{
 					return module.Start;

Memory/RemoteProcess.cs

@@ -59,10 +59,8 @@ public class Section
 		}
 
 		private readonly List<Module> modules = new List<Module>();
-		public IEnumerable<Module> Modules => modules;
 
 		private readonly List<Section> sections = new List<Section>();
-		public IEnumerable<Section> Sections => sections;
 
 		private readonly Symbols symbols = new Symbols();
 		public Symbols Symbols => symbols;
@@ -337,7 +335,7 @@ private string ReadRemoteRuntimeTypeInformation64(IntPtr address)
 			return null;
 		}
 
-#endregion
+		#endregion
 
 		#region WriteMemory
 
@@ -377,17 +375,33 @@ public bool WriteRemoteMemory<T>(IntPtr address, T value) where T : struct
 
 		public Section GetSectionToPointer(IntPtr address)
 		{
-			return sections
-				.Where(s => s.Category != SectionCategory.Unknown)
-				.Where(s => address.InRange(s.Start, s.End))
-				.FirstOrDefault();
+			lock (sections)
+			{
+				return sections
+					.Where(s => s.Category != SectionCategory.Unknown)
+					.Where(s => address.InRange(s.Start, s.End))
+					.FirstOrDefault();
+			}
 		}
 
 		public Module GetModuleToPointer(IntPtr address)
 		{
-			return modules
-				.Where(m => address.InRange(m.Start, m.End))
-				.FirstOrDefault();
+			lock (modules)
+			{
+				return modules
+					.Where(m => address.InRange(m.Start, m.End))
+					.FirstOrDefault();
+			}
+		}
+
+		public Module GetModuleByName(string name)
+		{
+			lock (modules)
+			{
+				return modules
+					.Where(m => m.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase))
+					.FirstOrDefault();
+			}
 		}
 
 		/// <summary>Tries to map the given address to a section or a module of the process.</summary>
@@ -420,16 +434,22 @@ public Task UpdateProcessInformationsAsync()
 		{
 			if (!IsValid)
 			{
-				modules.Clear();
-				sections.Clear();
+				lock(modules)
+				{
+					modules.Clear();
+				}
+				lock(sections)
+				{
+					sections.Clear();
+				}
 
 				return Task.CompletedTask;
 			}
 
 			return Task.Run(() =>
 			{
-				var modules = new List<Module>();
-				var sections = new List<Section>();
+				var newModules = new List<Module>();
+				var newSections = new List<Section>();
 
 				nativeHelper.EnumerateRemoteSectionsAndModules(
 					process.Handle,
@@ -459,11 +479,11 @@ public Task UpdateProcessInformationsAsync()
 								section.Category = SectionCategory.Data;
 								break;
 						}
-						sections.Add(section);
+						newSections.Add(section);
 					},
 					delegate (IntPtr baseAddress, IntPtr regionSize, string modulePath)
 					{
-						modules.Add(new Module
+						newModules.Add(new Module
 						{
 							Start = baseAddress,
 							End = baseAddress.Add(regionSize),
@@ -473,10 +493,16 @@ public Task UpdateProcessInformationsAsync()
 					}
 				);
 
-				this.modules.Clear();
-				this.modules.AddRange(modules);
-				this.sections.Clear();
-				this.sections.AddRange(sections);
+				lock (modules)
+				{
+					modules.Clear();
+					modules.AddRange(newModules);
+				}
+				lock (sections)
+				{
+					sections.Clear();
+					sections.AddRange(newSections);
+				}
 			});
 		}
 

Nodes/BaseHexCommentNode.cs

@@ -50,7 +50,7 @@ protected int AddComment(ViewInfo view, int x, int y, float fvalue, IntPtr ivalu
 
 				if (Program.Settings.ShowCommentSymbol)
 				{
-					var module = view.Memory.Process.Modules.Where(m => ivalue.InRange(m.Start, m.End)).FirstOrDefault();
+					var module = view.Memory.Process.GetModuleToPointer(ivalue);
 					if (module != null)
 					{
 						var symbols = view.Memory.Process.Symbols.GetSymbolsForModule(module);

SymbolReader/Symbols.cs

@@ -95,15 +95,23 @@ public void LoadSymbolsForModule(RemoteProcess.Module module)
 			Contract.Requires(module != null);
 
 			var reader = SymbolReader.FromModule(module, SymbolSearchPath);
-			symbolReaders[module.Name.ToLower()] = reader;
+
+			lock (symbolReaders)
+			{
+				symbolReaders[module.Name.ToLower()] = reader;
+			}
 		}
 
 		public void LoadSymbolsFromPDB(string path)
 		{
 			Contract.Requires(path != null);
 
 			var reader = SymbolReader.FromDatabase(path);
-			symbolReaders[Path.GetFileName(path).ToLower()] = reader;
+
+			lock (symbolReaders)
+			{
+				symbolReaders[Path.GetFileName(path).ToLower()] = reader;
+			}
 		}
 
 		public SymbolReader GetSymbolsForModule(RemoteProcess.Module module)
@@ -112,14 +120,17 @@ public SymbolReader GetSymbolsForModule(RemoteProcess.Module module)
 
 			var name = module.Name.ToLower();
 
-			SymbolReader reader;
-			if (!symbolReaders.TryGetValue(name, out reader))
+			lock (symbolReaders)
 			{
-				name = Path.ChangeExtension(name, ".pdb");
+				SymbolReader reader;
+				if (!symbolReaders.TryGetValue(name, out reader))
+				{
+					name = Path.ChangeExtension(name, ".pdb");
 
-				symbolReaders.TryGetValue(name, out reader);
+					symbolReaders.TryGetValue(name, out reader);
+				}
+				return reader;
 			}
-			return reader;
 		}
 	}
 }