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

[SCSI MODE] Fix handling of corrupt/invalid MODE SENSE (6) block descriptors. Fixes #842

Browse Source
This commit is contained in:
Natalia Portillo
2024-04-30 03:23:28 +01:00
parent 06d6a7cfcb
commit 0d140fac3a
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
View File

@@ -373,7 +373,11 @@ public partial class Dump
sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
if(sense)
Modes.DecodedMode? dcMode6 = null;
if(!sense)
dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
if(sense || dcMode6 is null)
{
sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
@@ -392,8 +396,6 @@ public partial class Dump
}
else
{
Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
if(dcMode6.HasValue)
{
foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>