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

2007-12-15 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Fixed the bug that prevents aria2 from loading cookie file when 
expire
	value is greater than 2^31-1. BUG#1851066
	* src/CookieBoxFactory.cc
	* test/CookieBoxFactoryTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2007-12-15 14:34:31 +00:00
parent 3ea4fe447a
commit 1e63b1cda5
4 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-15 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed the bug that prevents aria2 from loading cookie file when expire
value is greater than 2^31-1. BUG#1851066
* src/CookieBoxFactory.cc
* test/CookieBoxFactoryTest.cc
2007-12-14 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2007-12-14 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed possible memory leak when an exception is thrown. Fixed possible memory leak when an exception is thrown.

20
src/CookieBoxFactory.cc
View File

@ -35,6 +35,7 @@
#include "CookieBoxFactory.h" #include "CookieBoxFactory.h"
#include "CookieParser.h" #include "CookieParser.h"
#include "Util.h" #include "Util.h"
#include "RecoverableException.h"
CookieBoxHandle CookieBoxFactory::createNewInstance() CookieBoxHandle CookieBoxFactory::createNewInstance()
{ {
@ -50,9 +51,15 @@ void CookieBoxFactory::loadDefaultCookie(istream& s)
if(Util::startsWith(line, "#")) { if(Util::startsWith(line, "#")) {
continue; continue;
} }
Cookie c = parseNsCookie(line); try {
if(c.good()) { Cookie c = parseNsCookie(line);
defaultCookies.push_back(c); if(c.good()) {
defaultCookies.push_back(c);
}
} catch(RecoverableException* e) {
// ignore malformed cookie entry
// TODO better to log it
delete e;
} }
} }
} }
@ -68,7 +75,12 @@ Cookie CookieBoxFactory::parseNsCookie(const string& nsCookieStr) const
c.domain = vs[0]; c.domain = vs[0];
c.path = vs[2]; c.path = vs[2];
c.secure = vs[3] == "TRUE" ? true : false; c.secure = vs[3] == "TRUE" ? true : false;
c.expires = Util::parseInt(vs[4]); int64_t expireDate = Util::parseLLInt(vs[4]);
// TODO assuming time_t is int32_t...
if(expireDate > INT32_MAX) {
expireDate = INT32_MAX;
}
c.expires = expireDate;
c.name = vs[5]; c.name = vs[5];
if(vs.size() >= 7) { if(vs.size() >= 7) {
c.value = vs[6]; c.value = vs[6];

14
test/CookieBoxFactoryTest.cc
View File

@ -38,18 +38,30 @@ void CookieBoxFactoryTest::testLoadDefaultCookie()
Cookie c = cookies[0]; Cookie c = cookies[0];
CPPUNIT_ASSERT_EQUAL(string("JSESSIONID"), c.name); CPPUNIT_ASSERT_EQUAL(string("JSESSIONID"), c.name);
CPPUNIT_ASSERT_EQUAL(string("123456789"), c.value); CPPUNIT_ASSERT_EQUAL(string("123456789"), c.value);
CPPUNIT_ASSERT_EQUAL((time_t)1181473200, c.expires);
CPPUNIT_ASSERT_EQUAL(string("/"), c.path);
CPPUNIT_ASSERT_EQUAL(string("localhost"), c.domain);
c = cookies[1]; c = cookies[1];
CPPUNIT_ASSERT_EQUAL(string("user"), c.name); CPPUNIT_ASSERT_EQUAL(string("user"), c.name);
CPPUNIT_ASSERT_EQUAL(string("me"), c.value); CPPUNIT_ASSERT_EQUAL(string("me"), c.value);
CPPUNIT_ASSERT_EQUAL((time_t)1181473200, c.expires);
CPPUNIT_ASSERT_EQUAL(string("/"), c.path);
CPPUNIT_ASSERT_EQUAL(string("localhost"), c.domain);
c = cookies[2]; c = cookies[2];
CPPUNIT_ASSERT_EQUAL(string("passwd"), c.name); CPPUNIT_ASSERT_EQUAL(string("passwd"), c.name);
CPPUNIT_ASSERT_EQUAL(string("secret"), c.value); CPPUNIT_ASSERT_EQUAL(string("secret"), c.value);
CPPUNIT_ASSERT_EQUAL((time_t)2147483647, c.expires);
CPPUNIT_ASSERT_EQUAL(string("/cgi-bin"), c.path);
CPPUNIT_ASSERT_EQUAL(string("localhost"), c.domain);
c = cookies[3]; c = cookies[3];
CPPUNIT_ASSERT_EQUAL(string("novalue"), c.name); CPPUNIT_ASSERT_EQUAL(string("novalue"), c.name);
CPPUNIT_ASSERT_EQUAL(string(""), c.value); CPPUNIT_ASSERT_EQUAL(string(""), c.value);
CPPUNIT_ASSERT_EQUAL((time_t)2147483647, c.expires);
CPPUNIT_ASSERT_EQUAL(string("/"), c.path);
CPPUNIT_ASSERT_EQUAL(string("localhost"), c.domain);
} }
void CookieBoxFactoryTest::testCreateNewInstance() void CookieBoxFactoryTest::testCreateNewInstance()
@ -60,5 +72,5 @@ void CookieBoxFactoryTest::testCreateNewInstance()
CookieBoxHandle box = factory.createNewInstance(); CookieBoxHandle box = factory.createNewInstance();
Cookies cookies = box->criteriaFind("localhost", "/", 0, true); Cookies cookies = box->criteriaFind("localhost", "/", 0, true);
CPPUNIT_ASSERT_EQUAL((int32_t)4, (int32_t)cookies.size()); CPPUNIT_ASSERT_EQUAL((int32_t)3, (int32_t)cookies.size());
} }

5
test/nscookietest.txt
View File

@ -3,5 +3,6 @@ localhost FALSE / TRUE 1181473200 JSESSIONID 123456789
localhost FALSE / FALSE 1181473200 user me localhost FALSE / FALSE 1181473200 user me
localhost FALSE / FALSE 1181473200 passwd secret localhost FALSE /cgi-bin FALSE 2147483647 passwd secret
localhost FALSE / FALSE 1181473200 novalue overflow FALSE / FALSE FALSE 9223372036854775807 TAX 1000
localhost FALSE / FALSE 2147483648 novalue