aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decoding SCSI MODE SENSE (10) when the pages are too small

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-13 18:07:33 +01:00
parent 8247239152
commit e0047f5cc9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SCSI/Modes/Mode10.cs
View File

@@ -183,7 +183,7 @@ namespace Aaru.Decoders.SCSI
if(length != modeResponse.Length)
return decoded;
List<ModePage> listpages = new List<ModePage>();
List<ModePage> listpages = new();
while(offset < modeResponse.Length)
{
@@ -201,7 +201,7 @@ namespace Aaru.Decoders.SCSI
}
else
{
if(isSubpage)
if(isSubpage && offset + 3 < modeResponse.Length)
{
pg.PageResponse = new byte[(modeResponse[offset + 2] << 8) + modeResponse[offset + 3] + 4];
int copyLen = pg.PageResponse.Length;
@@ -214,7 +214,7 @@ namespace Aaru.Decoders.SCSI
pg.Subpage = modeResponse[offset + 1];
offset += pg.PageResponse.Length;
}
else
else if(isSubpage && offset + 1 < modeResponse.Length)
{
pg.PageResponse = new byte[modeResponse[offset + 1] + 2];
int copyLen = pg.PageResponse.Length;
@@ -227,6 +227,8 @@ namespace Aaru.Decoders.SCSI
pg.Subpage = 0;
offset += pg.PageResponse.Length;
}
else
offset = modeResponse.Length;
}
listpages.Add(pg);