sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 17:38:35 +02:00
Code Issues Projects Releases Wiki Activity

VSA: Fix incorrect bytesRead value for end of overlapped buffer

Browse Source
This commit is contained in:
Max Brombach
2025-09-30 14:03:21 -04:00
committed by Kyle Schwarz
parent b9d3dde8d5
commit a5ec9a2d20
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/device.cpp
+10 -2
View File
@@ -3315,10 +3315,18 @@ std::optional<uint64_t> Device::vsaReadLogicalDisk(uint64_t pos, uint8_t* into,
return readLogicalDisk(pos, into, amount); return readLogicalDisk(pos, into, amount);
} }
uint64_t firstReadAmount = diskSize - pos; uint64_t firstReadAmount = diskSize - pos;
if(!readLogicalDisk(pos, into, firstReadAmount)) { uint64_t bytesRead = 0;
if(auto optBytesReadFirst = readLogicalDisk(pos, into, firstReadAmount)) {
bytesRead = *optBytesReadFirst;
} else {
return std::nullopt; return std::nullopt;
} }
return readLogicalDisk(VSA::RecordStartOffset, into + firstReadAmount, amount - firstReadAmount); if(auto optBytesReadSecond = readLogicalDisk(VSA::RecordStartOffset, into + firstReadAmount, amount - firstReadAmount)) {
bytesRead += *optBytesReadSecond;
} else {
return std::nullopt;
}
return bytesRead;
} }
bool Device::dispatchVSAMessages(VSAParser& parser) { bool Device::dispatchVSAMessages(VSAParser& parser) {