zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-16 17:37:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix: FormatException was thrown upon InvalidDataException in some cases

Browse source
This commit is contained in:
Tal Aloni 2017-12-13 23:42:55 +02:00
parent 0f89729085
commit 24a65d0a03
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SMBLibrary/NetBios/SessionPackets/SessionPacket.cs
View file

@ -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"));
}
}
}

4
SMBLibrary/SMB1/Commands/SMB1Command.cs
View file

@ -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"));
}
}

4
SMBLibrary/SMB2/Commands/SMB2Command.cs
View file

@ -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"));
}
}