nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix partition reads and writes at end.

This commit is contained in:
Jonas 'Sortie' Termansen 2015-09-14 22:51:03 +02:00
parent 6813a26196
commit ac6f016748
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/partition.cpp
View File

@ -77,9 +77,7 @@ off_t Partition::lseek(ioctx_t* /*ctx*/, off_t offset, int whence)
ssize_t Partition::pread(ioctx_t* ctx, uint8_t* buf, size_t count, off_t off) ssize_t Partition::pread(ioctx_t* ctx, uint8_t* buf, size_t count, off_t off)
{ {
// TODO: Avoid underflow and overflow! if ( length <= off )
off_t end_at = off + count;
if ( length <= end_at )
return 0; return 0;
off_t available = length - off; off_t available = length - off;
if ( (uintmax_t) available < (uintmax_t) count ) if ( (uintmax_t) available < (uintmax_t) count )
@ -90,9 +88,7 @@ ssize_t Partition::pread(ioctx_t* ctx, uint8_t* buf, size_t count, off_t off)
ssize_t Partition::pwrite(ioctx_t* ctx, const uint8_t* buf, size_t count, ssize_t Partition::pwrite(ioctx_t* ctx, const uint8_t* buf, size_t count,
off_t off) off_t off)
{ {
// TODO: Avoid underflow and overflow! if ( length <= off )
off_t end_at = off + count;
if ( length <= end_at )
return 0; return 0;
off_t available = length - off; off_t available = length - off;
if ( (uintmax_t) available < (uintmax_t) count ) if ( (uintmax_t) available < (uintmax_t) count )