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

2008-11-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed the bug that causes floating exception when -T option is
	used and no URIs are given.
	* src/download_helper.cc
	* test/DownloadHelperTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-11-23 12:13:53 +00:00
parent 67d5d6d55e
commit c104ac8319
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-11-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed the bug that causes floating exception when -T option is used and
no URIs are given.
* src/download_helper.cc
* test/DownloadHelperTest.cc
2008-11-22 Ross Smith II <aria2spam at smithii dot com> 2008-11-22 Ross Smith II <aria2spam at smithii dot com>
Applied aria2-1.0.0-mingw-r5.patch to fix numerous compile/unit test Applied aria2-1.0.0-mingw-r5.patch to fix numerous compile/unit test

2
src/download_helper.cc
View File

@ -79,7 +79,7 @@ static void splitURI(std::deque<std::string>& result,
size_t numURIs = std::distance(begin, end); size_t numURIs = std::distance(begin, end);
if(numURIs >= numSplit) { if(numURIs >= numSplit) {
result.insert(result.end(), begin, end); result.insert(result.end(), begin, end);
} else { } else if(numURIs > 0) {
for(size_t i = 0; i < numSplit/numURIs; ++i) { for(size_t i = 0; i < numSplit/numURIs; ++i) {
result.insert(result.end(), begin, end); result.insert(result.end(), begin, end);
} }

12
test/DownloadHelperTest.cc
View File

@ -360,6 +360,18 @@ void DownloadHelperTest::testCreateRequestGroupForBitTorrent()
} }
CPPUNIT_ASSERT_EQUAL((unsigned int)5, group->getNumConcurrentCommand()); CPPUNIT_ASSERT_EQUAL((unsigned int)5, group->getNumConcurrentCommand());
} }
{
// no URIs are given
std::deque<SharedHandle<RequestGroup> > result;
std::deque<std::string> emptyURIs;
createRequestGroupForBitTorrent(result, &op, emptyURIs);
CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
SharedHandle<RequestGroup> group = result[0];
std::deque<std::string> uris;
group->getURIs(uris);
CPPUNIT_ASSERT_EQUAL((size_t)0, uris.size());
}
op.put(PREF_FORCE_SEQUENTIAL, V_TRUE); op.put(PREF_FORCE_SEQUENTIAL, V_TRUE);
{ {
std::deque<SharedHandle<RequestGroup> > result; std::deque<SharedHandle<RequestGroup> > result;