[Fix] Clamp cache size (#3038)

* fix * clamp max cache size * net 4.6.1 strikes again * real
discord-net · Dec 13, 2024 · 438e31e · 438e31e
1 parent d2d8d73
commit 438e31e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Discord.Net.WebSocket/Entities/AuditLogs/AuditLogCache.cs b/src/Discord.Net.WebSocket/Entities/AuditLogs/AuditLogCache.cs
@@ -18,8 +18,13 @@ internal class AuditLogCache
     public AuditLogCache(DiscordSocketClient client)
     {
         _size = client.AuditLogCacheSize;
+        var dictSize = _size;
+        if (dictSize * 1.05 > int.MaxValue)
+            dictSize = int.MaxValue;
+        else
+            dictSize = (int)(dictSize * 1.05);
 
-        _entries = new ConcurrentDictionary<ulong, SocketAuditLogEntry>(ConcurrentHashSet.DefaultConcurrencyLevel, (int)(_size * 1.05));
+        _entries = new ConcurrentDictionary<ulong, SocketAuditLogEntry>(ConcurrentHashSet.DefaultConcurrencyLevel, dictSize);
         _orderedEntries = new ConcurrentQueue<ulong>();
     }
 

diff --git a/src/Discord.Net.WebSocket/Entities/Messages/MessageCache.cs b/src/Discord.Net.WebSocket/Entities/Messages/MessageCache.cs
@@ -17,7 +17,12 @@ internal class MessageCache
         public MessageCache(DiscordSocketClient discord)
         {
             _size = discord.MessageCacheSize;
-            _messages = new ConcurrentDictionary<ulong, SocketMessage>(ConcurrentHashSet.DefaultConcurrencyLevel, (int)(_size * 1.05));
+            var dictSize = _size;
+            if (dictSize * 1.05 > int.MaxValue)
+                dictSize = int.MaxValue;
+            else
+                dictSize = (int)(dictSize * 1.05);
+            _messages = new ConcurrentDictionary<ulong, SocketMessage>(ConcurrentHashSet.DefaultConcurrencyLevel, dictSize);
             _orderedMessages = new ConcurrentQueue<ulong>();
         }