From 24a65d0a037c49fbba1fbed62b77e3854d2c6c6e Mon Sep 17 00:00:00 2001 From: Tal Aloni Date: Wed, 13 Dec 2017 23:42:55 +0200 Subject: [PATCH] Bugfix: FormatException was thrown upon InvalidDataException in some cases --- SMBLibrary/NetBios/SessionPackets/SessionPacket.cs | 2 +- SMBLibrary/SMB1/Commands/SMB1Command.cs | 4 ++-- SMBLibrary/SMB2/Commands/SMB2Command.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SMBLibrary/NetBios/SessionPackets/SessionPacket.cs b/SMBLibrary/NetBios/SessionPackets/SessionPacket.cs index 7b114b6..d3c8fe3 100644 --- a/SMBLibrary/NetBios/SessionPackets/SessionPacket.cs +++ b/SMBLibrary/NetBios/SessionPackets/SessionPacket.cs @@ -81,7 +81,7 @@ namespace SMBLibrary.NetBios case SessionPacketTypeName.SessionKeepAlive: return new SessionKeepAlivePacket(buffer, offset); default: - throw new InvalidDataException("Invalid NetBIOS session packet type: 0x" + type.ToString("X2")); + throw new InvalidDataException("Invalid NetBIOS session packet type: 0x" + ((byte)type).ToString("X2")); } } } diff --git a/SMBLibrary/SMB1/Commands/SMB1Command.cs b/SMBLibrary/SMB1/Commands/SMB1Command.cs index 8caf5d9..6b06cef 100644 --- a/SMBLibrary/SMB1/Commands/SMB1Command.cs +++ b/SMBLibrary/SMB1/Commands/SMB1Command.cs @@ -163,7 +163,7 @@ namespace SMBLibrary.SMB1 case CommandName.SMB_COM_NT_CANCEL: return new NTCancelRequest(buffer, offset); default: - throw new InvalidDataException("Invalid SMB command 0x" + commandName.ToString("X2")); + throw new InvalidDataException("Invalid SMB command 0x" + ((byte)commandName).ToString("X2")); } } @@ -475,7 +475,7 @@ namespace SMBLibrary.SMB1 } } default: - throw new InvalidDataException("Invalid SMB command 0x" + commandName.ToString("X2")); + throw new InvalidDataException("Invalid SMB command 0x" + ((byte)commandName).ToString("X2")); } } diff --git a/SMBLibrary/SMB2/Commands/SMB2Command.cs b/SMBLibrary/SMB2/Commands/SMB2Command.cs index 3cad214..deda7d5 100644 --- a/SMBLibrary/SMB2/Commands/SMB2Command.cs +++ b/SMBLibrary/SMB2/Commands/SMB2Command.cs @@ -104,7 +104,7 @@ namespace SMBLibrary.SMB2 case SMB2CommandName.SetInfo: return new SetInfoRequest(buffer, offset); default: - throw new InvalidDataException("Invalid SMB2 command 0x" + commandName.ToString("X4")); + throw new InvalidDataException("Invalid SMB2 command 0x" + ((ushort)commandName).ToString("X4")); } } @@ -471,7 +471,7 @@ namespace SMBLibrary.SMB2 } } default: - throw new InvalidDataException("Invalid SMB2 command 0x" + commandName.ToString("X4")); + throw new InvalidDataException("Invalid SMB2 command 0x" + ((ushort)commandName).ToString("X4")); } }