opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix read over file end (Tullio Andreatta, Julian Sikorski, Szabolcs Szakacsits)

master
szaka 2007-11-03 23:09:11 +00:00
parent 028f73740d
commit 729ee43330
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ntfs-3g.c
View File

@ -617,10 +617,8 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
goto exit;
}
if (offset + size > na->data_size) {
if (na->data_size < offset) {
res = -EINVAL;
goto exit;
}
if (na->data_size < offset)
goto ok;
size = na->data_size - offset;
}
while (size > 0) {
@ -630,13 +628,14 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
"offset %lld: %lld <> %lld", org_path,
(long long)offset, (long long)size, (long long)ret);
if (ret <= 0 || ret > (s64)size) {
res = (ret <= 0) ? -errno : -EIO;
res = (ret < 0) ? -errno : -EIO;
goto exit;
}
size -= ret;
offset += ret;
total += ret;
}
ok:
res = total;
exit:
if (na)