Merge pull request #5290 from Bond-009/nullref

Fix possible null ref exception
This commit is contained in:
Joshua M. Boniface 2021-02-22 21:00:04 -05:00 committed by GitHub
commit 1442a63556
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,3 +1,5 @@
#nullable enable
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -29,7 +31,7 @@ namespace Emby.Server.Implementations.EntryPoints
/// <summary> /// <summary>
/// The UDP server. /// The UDP server.
/// </summary> /// </summary>
private UdpServer _udpServer; private UdpServer? _udpServer;
private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource(); private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
private bool _disposed = false; private bool _disposed = false;
@ -71,9 +73,8 @@ namespace Emby.Server.Implementations.EntryPoints
} }
_cancellationTokenSource.Cancel(); _cancellationTokenSource.Cancel();
_udpServer.Dispose();
_cancellationTokenSource.Dispose(); _cancellationTokenSource.Dispose();
_cancellationTokenSource = null; _udpServer?.Dispose();
_udpServer = null; _udpServer = null;
_disposed = true; _disposed = true;