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

Do not skip pages when decoding a page longer than the MODE SENSE buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2020-12-03 17:43:34 +00:00
parent 226aadf225
commit 22dcde2c32
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SCSI/Modes/Mode10.cs
View File

@@ -204,11 +204,12 @@ namespace Aaru.Decoders.SCSI
if(isSubpage) if(isSubpage)
{ {
pg.PageResponse = new byte[(modeResponse[offset + 2] << 8) + modeResponse[offset + 3] + 4]; pg.PageResponse = new byte[(modeResponse[offset + 2] << 8) + modeResponse[offset + 3] + 4];
int copyLen = pg.PageResponse.Length;
if(pg.PageResponse.Length + offset > modeResponse.Length) if(pg.PageResponse.Length + offset > modeResponse.Length)
return decoded; copyLen = modeResponse.Length - offset;
Array.Copy(modeResponse, offset, pg.PageResponse, 0, pg.PageResponse.Length); Array.Copy(modeResponse, offset, pg.PageResponse, 0, copyLen);
pg.Page = (byte)(modeResponse[offset] & 0x3F); pg.Page = (byte)(modeResponse[offset] & 0x3F);
pg.Subpage = modeResponse[offset + 1]; pg.Subpage = modeResponse[offset + 1];
offset += pg.PageResponse.Length; offset += pg.PageResponse.Length;
@@ -216,11 +217,12 @@ namespace Aaru.Decoders.SCSI
else else
{ {
pg.PageResponse = new byte[modeResponse[offset + 1] + 2]; pg.PageResponse = new byte[modeResponse[offset + 1] + 2];
int copyLen = pg.PageResponse.Length;
if(pg.PageResponse.Length + offset > modeResponse.Length) if(pg.PageResponse.Length + offset > modeResponse.Length)
return decoded; copyLen = modeResponse.Length - offset;
Array.Copy(modeResponse, offset, pg.PageResponse, 0, pg.PageResponse.Length); Array.Copy(modeResponse, offset, pg.PageResponse, 0, copyLen);
pg.Page = (byte)(modeResponse[offset] & 0x3F); pg.Page = (byte)(modeResponse[offset] & 0x3F);
pg.Subpage = 0; pg.Subpage = 0;
offset += pg.PageResponse.Length; offset += pg.PageResponse.Length;

10
SCSI/Modes/Mode6.cs
View File

@@ -149,11 +149,12 @@ namespace Aaru.Decoders.SCSI
break; break;
pg.PageResponse = new byte[(modeResponse[offset + 2] << 8) + modeResponse[offset + 3] + 4]; pg.PageResponse = new byte[(modeResponse[offset + 2] << 8) + modeResponse[offset + 3] + 4];
int copyLen = pg.PageResponse.Length;
if(pg.PageResponse.Length + offset > modeResponse.Length) if(pg.PageResponse.Length + offset > modeResponse.Length)
return decoded; copyLen = modeResponse.Length - offset;
Array.Copy(modeResponse, offset, pg.PageResponse, 0, pg.PageResponse.Length); Array.Copy(modeResponse, offset, pg.PageResponse, 0, copyLen);
pg.Page = (byte)(modeResponse[offset] & 0x3F); pg.Page = (byte)(modeResponse[offset] & 0x3F);
pg.Subpage = modeResponse[offset + 1]; pg.Subpage = modeResponse[offset + 1];
offset += pg.PageResponse.Length; offset += pg.PageResponse.Length;
@@ -164,11 +165,12 @@ namespace Aaru.Decoders.SCSI
break; break;
pg.PageResponse = new byte[modeResponse[offset + 1] + 2]; pg.PageResponse = new byte[modeResponse[offset + 1] + 2];
int copyLen = pg.PageResponse.Length;
if(pg.PageResponse.Length + offset > modeResponse.Length) if(pg.PageResponse.Length + offset > modeResponse.Length)
return decoded; copyLen = modeResponse.Length - offset;
Array.Copy(modeResponse, offset, pg.PageResponse, 0, pg.PageResponse.Length); Array.Copy(modeResponse, offset, pg.PageResponse, 0, copyLen);
pg.Page = (byte)(modeResponse[offset] & 0x3F); pg.Page = (byte)(modeResponse[offset] & 0x3F);
pg.Subpage = 0; pg.Subpage = 0;
offset += pg.PageResponse.Length; offset += pg.PageResponse.Length;