BUGFIX: Resolve concurrency issue in string heap caches.

Washi1337 · May 17, 2024 · b1ded1f · b1ded1f
1 parent a640a82
commit b1ded1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/AsmResolver.PE/DotNet/Metadata/Strings/SerializedStringsStream.cs b/src/AsmResolver.PE/DotNet/Metadata/Strings/SerializedStringsStream.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Concurrent;
 using AsmResolver.IO;
 
 namespace AsmResolver.PE.DotNet.Metadata.Strings
@@ -9,7 +8,7 @@ namespace AsmResolver.PE.DotNet.Metadata.Strings
     /// </summary>
     public class SerializedStringsStream : StringsStream
     {
-        private readonly Dictionary<uint, Utf8String> _cachedStrings = new();
+        private readonly ConcurrentDictionary<uint, Utf8String> _cachedStrings = new();
         private readonly BinaryStreamReader _reader;
 
         /// <summary>
@@ -66,7 +65,7 @@ public SerializedStringsStream(string name, in BinaryStreamReader reader)
             {
                 var stringsReader = _reader.ForkRelative(index);
                 value = stringsReader.ReadUtf8String();
-                _cachedStrings[index] = value;
+                _cachedStrings.TryAdd(index, value);
             }
 
             return value;

diff --git a/src/AsmResolver.PE/DotNet/Metadata/UserStrings/SerializedUserStringsStream.cs b/src/AsmResolver.PE/DotNet/Metadata/UserStrings/SerializedUserStringsStream.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Text;
 using AsmResolver.IO;
 
@@ -9,7 +9,7 @@ namespace AsmResolver.PE.DotNet.Metadata.UserStrings
     /// </summary>
     public class SerializedUserStringsStream : UserStringsStream
     {
-        private readonly Dictionary<uint, string?> _cachedStrings = new();
+        private readonly ConcurrentDictionary<uint, string?> _cachedStrings = new();
         private readonly BinaryStreamReader _reader;
 
         /// <summary>
@@ -79,7 +79,7 @@ public SerializedUserStringsStream(string name, BinaryStreamReader reader)
                     value = Encoding.Unicode.GetString(data, 0, actualLength - 1);
                 }
 
-                _cachedStrings[index] = value;
+                _cachedStrings.TryAdd(index, value);
             }
 
             return value;