lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nullability errors in Emby.Server.Implementations

Browse Source
This commit is contained in:
crobibero 2020-11-13 09:41:18 -07:00
parent d5e2369dd6
commit 7bf320922c
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/AppBase/ConfigurationHelper.cs
View File

@ -35,7 +35,8 @@ namespace Emby.Server.Implementations.AppBase
} }
catch (Exception) catch (Exception)
{ {
configuration = Activator.CreateInstance(type); var instanceConfiguration = Activator.CreateInstance(type);
configuration = instanceConfiguration ?? throw new NullReferenceException(nameof(instanceConfiguration));
} }
using var stream = new MemoryStream(buffer?.Length ?? 0); using var stream = new MemoryStream(buffer?.Length ?? 0);
@ -48,8 +49,13 @@ namespace Emby.Server.Implementations.AppBase
// If the file didn't exist before, or if something has changed, re-save // If the file didn't exist before, or if something has changed, re-save
if (buffer == null || !newBytes.AsSpan(0, newBytesLen).SequenceEqual(buffer)) if (buffer == null || !newBytes.AsSpan(0, newBytesLen).SequenceEqual(buffer))
{ {
Directory.CreateDirectory(Path.GetDirectoryName(path)); var directory = Path.GetDirectoryName(path);
if (directory == null)
{
throw new NullReferenceException(nameof(directory));
}
Directory.CreateDirectory(directory);
// Save it after load in case we got new items // Save it after load in case we got new items
using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read)) using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
{ {

5
Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
View File

@ -81,6 +81,11 @@ namespace Emby.Server.Implementations.Cryptography
} }
using var h = HashAlgorithm.Create(hashMethod); using var h = HashAlgorithm.Create(hashMethod);
if (h == null)
{
throw new NullReferenceException(nameof(h));
}
if (salt.Length == 0) if (salt.Length == 0)
{ {
return h.ComputeHash(bytes); return h.ComputeHash(bytes);

7
Emby.Server.Implementations/Session/WebSocketController.cs
View File

@ -55,8 +55,13 @@ namespace Emby.Server.Implementations.Session
connection.Closed += OnConnectionClosed; connection.Closed += OnConnectionClosed;
} }
private void OnConnectionClosed(object sender, EventArgs e) private void OnConnectionClosed(object? sender, EventArgs e)
{ {
if (sender == null)
{
throw new NullReferenceException(nameof(sender));
}
var connection = (IWebSocketConnection)sender; var connection = (IWebSocketConnection)sender;
_logger.LogDebug("Removing websocket from session {Session}", _session.Id); _logger.LogDebug("Removing websocket from session {Session}", _session.Id);
_sockets.Remove(connection); _sockets.Remove(connection);