github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Clamp cache size (#3038)

Browse Source 
* fix

* clamp max cache size

* net 4.6.1 strikes again

* real
This commit is contained in:
Mihail Gribkov
2024-12-14 02:17:11 +08:00
committed by GitHub
parent d2d8d73170
commit 438e31edd1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net.WebSocket/Entities/AuditLogs/AuditLogCache.cs
View File

@@ -18,8 +18,13 @@ internal class AuditLogCache
public AuditLogCache(DiscordSocketClient client) public AuditLogCache(DiscordSocketClient client)
{ {
_size = client.AuditLogCacheSize; _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>(); _orderedEntries = new ConcurrentQueue<ulong>();
} }

7
src/Discord.Net.WebSocket/Entities/Messages/MessageCache.cs
View File

@@ -17,7 +17,12 @@ namespace Discord.WebSocket
public MessageCache(DiscordSocketClient discord) public MessageCache(DiscordSocketClient discord)
{ {
_size = discord.MessageCacheSize; _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>(); _orderedMessages = new ConcurrentQueue<ulong>();
} }