mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't enable mmap if file allocation is disabled

Browse source 
Without file allocation, we cannot map file because file length could
be zero.

This could fix bug reported at GH-478
This commit is contained in:
Tatsuhiro Tsujikawa 2015-11-12 22:42:24 +09:00
parent af98861aff
commit 3974c1223b
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/AbstractDiskWriter.cc
View file

@ -284,12 +284,10 @@ ssize_t AbstractDiskWriter::readDataInternal(unsigned char* data, size_t len,
int64_t offset)
{
if(mapaddr_) {
ssize_t readlen;
if(offset > maplen_) {
readlen = 0;
} else {
readlen = std::min(static_cast<size_t>(maplen_ - offset), len);
if (offset >= maplen_) {
return 0;
}
auto readlen = std::min(maplen_ - offset, static_cast<int64_t>(len));
memcpy(data, mapaddr_ + offset, readlen);
return readlen;
} else {
@ -355,6 +353,14 @@ void AbstractDiskWriter::ensureMmapWrite(size_t len, int64_t offset)
}
} else {
int64_t filesize = size();
if (filesize == 0) {
// mapping 0 length file is useless. Also munmap with size ==
// 0 will fail with EINVAL.
enableMmap_ = false;
return;
}
int errNum = 0;
if(static_cast<int64_t>(len + offset) <= filesize) {
#ifdef __MINGW32__