NeoFlock/neonucleus
2
0
Fork 0
mirror of https://github.com/NeoFlock/neonucleus.git synced 2025-09-24 09:03:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

drive now err's on an invalid sector/buffer

Browse Source
This commit is contained in:
Speedy_Lex 2025-07-02 11:12:38 +02:00
parent 7c15adc305
commit b809a07982
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/drive.c
View File

@ -52,6 +52,11 @@ void nn_drive_readSector(nn_drive *drive, void *_, nn_component *component, nn_c
int sector = nn_toInt(sectorValue); int sector = nn_toInt(sectorValue);
size_t sector_size = drive->getSectorSize(component, drive->userdata); size_t sector_size = drive->getSectorSize(component, drive->userdata);
char buf[sector_size]; char buf[sector_size];
// we leave the +1 intentionally to compare the end of the real sector
if (sector < 1 || (sector * sector_size > drive->getCapacity(component, drive->userdata))) {
nn_setCError(computer, "bad argument #1 (sector out of range)");
return;
}
drive->readSector(component, drive->userdata, sector, buf); drive->readSector(component, drive->userdata, sector, buf);
nn_return_string(computer, buf, sector_size); nn_return_string(computer, buf, sector_size);
} }
@ -63,14 +68,16 @@ void nn_drive_writeSector(nn_drive *drive, void *_, nn_component *component, nn_
size_t buf_size = 0; size_t buf_size = 0;
const char *buf = nn_toString(bufValue, &buf_size); const char *buf = nn_toString(bufValue, &buf_size);
if (buf_size < sector_size) { if (buf_size != sector_size) {
char padded[sector_size]; nn_setCError(computer, "bad argument #2 (expected buffer of length `sectorSize`)");
memset(padded, 0, sector_size); return;
memcpy(padded, buf, buf_size);
drive->writeSector(component, drive->userdata, sector, padded);
} else {
drive->writeSector(component, drive->userdata, sector, buf);
} }
// we leave the +1 intentionally to compare the end of the real sector
if (sector < 1 || (sector * sector_size > drive->getCapacity(component, drive->userdata))) {
nn_setCError(computer, "bad argument #1 (sector out of range)");
return;
}
drive->writeSector(component, drive->userdata, sector, buf);
} }
void nn_drive_readByte(nn_drive *drive, void *_, nn_component *component, nn_computer *computer) { void nn_drive_readByte(nn_drive *drive, void *_, nn_component *component, nn_computer *computer) {
nn_value offsetValue = nn_getArgument(computer, 0); nn_value offsetValue = nn_getArgument(computer, 0);