github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Fixed the bug that causes segmentation fault when accessing files which
	don't exist or are not included in --select-file option while
	validating chunk checksum.
	* src/MultiDiskAdaptor.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-10-21 15:34:56 +00:00
parent 837585e095
commit cdb5796615
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed the bug that causes segmentation fault when accessing files which
don't exist or are not included in --select-file option while
validating chunk checksum.
* src/MultiDiskAdaptor.cc
2008-10-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-10-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed compiler warning. Fixed compiler warning.

18
src/MultiDiskAdaptor.cc
View File

@ -372,6 +372,16 @@ findFirstDiskWriterEntry(const DiskWriterEntries& diskWriterEntries, off_t offse
return first; return first;
} }
static void throwOnDiskWriterNotOpened(const SharedHandle<DiskWriterEntry>& e,
off_t offset,
const std::string& topDirPath)
{
throw DlAbortEx
(StringFormat("DiskWriter for offset=%s, filename=%s is not opened.",
Util::itos(offset).c_str(),
e->getFilePath(topDirPath).c_str()).str());
}
void MultiDiskAdaptor::writeData(const unsigned char* data, size_t len, void MultiDiskAdaptor::writeData(const unsigned char* data, size_t len,
off_t offset) off_t offset)
{ {
@ -384,6 +394,10 @@ void MultiDiskAdaptor::writeData(const unsigned char* data, size_t len,
openIfNot(*i, &DiskWriterEntry::openFile, _cachedTopDirPath); openIfNot(*i, &DiskWriterEntry::openFile, _cachedTopDirPath);
if(!(*i)->isOpen()) {
throwOnDiskWriterNotOpened(*i, offset+(len-rem), _cachedTopDirPath);
}
(*i)->getDiskWriter()->writeData(data+(len-rem), writeLength, fileOffset); (*i)->getDiskWriter()->writeData(data+(len-rem), writeLength, fileOffset);
rem -= writeLength; rem -= writeLength;
fileOffset = 0; fileOffset = 0;
@ -405,6 +419,10 @@ ssize_t MultiDiskAdaptor::readData(unsigned char* data, size_t len, off_t offset
openIfNot(*i, &DiskWriterEntry::openFile, _cachedTopDirPath); openIfNot(*i, &DiskWriterEntry::openFile, _cachedTopDirPath);
if(!(*i)->isOpen()) {
throwOnDiskWriterNotOpened(*i, offset+(len-rem), _cachedTopDirPath);
}
totalReadLength += totalReadLength +=
(*i)->getDiskWriter()->readData(data+(len-rem), readLength, fileOffset); (*i)->getDiskWriter()->readData(data+(len-rem), readLength, fileOffset);
rem -= readLength; rem -= readLength;