From a1fd2a61e409a0d32b9eaf87526a79b7065070be Mon Sep 17 00:00:00 2001 From: quin lynch Date: Fri, 2 Jul 2021 17:55:16 -0300 Subject: [PATCH] Fixed potential null ref in builder --- src/Discord.Net.Core/Discord.Net.Core.csproj | 4 ++-- .../Interactions/Message Components/ComponentBuilder.cs | 2 +- src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj | 2 +- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj index 9bebe08ae..8ff32d2bb 100644 --- a/src/Discord.Net.Core/Discord.Net.Core.csproj +++ b/src/Discord.Net.Core/Discord.Net.Core.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ net461;netstandard2.0;netstandard2.1 netstandard2.0;netstandard2.1 Discord.Net.Labs.Core - 2.3.9-pre + 2.3.9-dev Discord.Net.Labs.Core https://github.com/Discord-Net-Labs/Discord.Net-Labs Temporary.png diff --git a/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs index afd1e34bd..33665210d 100644 --- a/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs +++ b/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs @@ -243,7 +243,7 @@ namespace Discord } } - private List _components { get; set; } + private List _components { get; set; } = new List(); /// /// Adds a list of components to the current row. diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj index 6660f1311..91d8823d1 100644 --- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj +++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj @@ -8,7 +8,7 @@ net461;netstandard2.0;netstandard2.1 netstandard2.0;netstandard2.1 true - 2.3.9-pre + 2.3.9-dev https://github.com/Discord-Net-Labs/Discord.Net-Labs https://github.com/Discord-Net-Labs/Discord.Net-Labs Temporary.png diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs index 9f7a1e524..be468fe30 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -1865,6 +1865,8 @@ namespace Discord.WebSocket { await _gatewayLogger.DebugAsync("Received Dispatch (INTERACTION_CREATE)").ConfigureAwait(false); + // 0x546861742062696720656e6469616e20656e636f64696e67206d616b6573206d79316d687a20636c6f636b207469636b + var data = (payload as JToken).ToObject(_serializer); SocketChannel channel = null;