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

Only accepts 32 bit integer values from int and i4 elements in XML-RPC.

Browse source 
Fixed overflow in AbstractPaginationRpcMethod::getPaginationRange().
Fixes bug#3494165
This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-26 19:45:25 +09:00
parent 7a1cba2c59
commit ad11d746f0
3 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/RpcMethodImpl.h
View file

@ -331,11 +331,11 @@ private:
template<typename InputIterator> template<typename InputIterator>
std::pair<InputIterator, InputIterator> std::pair<InputIterator, InputIterator>
getPaginationRange getPaginationRange
(int offset, int num, InputIterator first, InputIterator last) (int64_t offset, int64_t num, InputIterator first, InputIterator last)
{ {
int size = std::distance(first, last); int64_t size = std::distance(first, last);
if(offset < 0) { if(offset < 0) {
int tempoffset = offset+size; int64_t tempoffset = offset+size;
if(tempoffset < 0) { if(tempoffset < 0) {
return std::make_pair(last, last); return std::make_pair(last, last);
} }
@ -347,7 +347,7 @@ private:
} else if(size <= offset) { } else if(size <= offset) {
return std::make_pair(last, last); return std::make_pair(last, last);
} }
int lastDistance; int64_t lastDistance;
if(size < offset+num) { if(size < offset+num) {
lastDistance = size; lastDistance = size;
} else { } else {
@ -369,8 +369,8 @@ protected:
if(numParam->i() < 0) { if(numParam->i() < 0) {
throw DL_ABORT_EX("The parameter num must be zero or positive integer."); throw DL_ABORT_EX("The parameter num must be zero or positive integer.");
} }
int offset = offsetParam->i(); int64_t offset = offsetParam->i();
int num = numParam->i(); int64_t num = numParam->i();
std::vector<std::string> keys; std::vector<std::string> keys;
toStringList(std::back_inserter(keys), keysParam); toStringList(std::back_inserter(keys), keysParam);
const std::deque<SharedHandle<T> >& items = getItems(e); const std::deque<SharedHandle<T> >& items = getItems(e);

4
src/XmlRpcRequestParserStateImpl.cc
View file

@ -200,8 +200,8 @@ void IntXmlRpcRequestParserState::endElement
const char* name, const char* name,
const std::string& characters) const std::string& characters)
{ {
int64_t value; int32_t value;
if(util::parseLLIntNoThrow(value, characters)) { if(util::parseIntNoThrow(value, characters)) {
psm->setCurrentFrameValue(Integer::g(value)); psm->setCurrentFrameValue(Integer::g(value));
} else { } else {
// nothing to do here: We just leave current frame value to null. // nothing to do here: We just leave current frame value to null.

30
test/RpcMethodTest.cc
View file

@ -652,6 +652,36 @@ void RpcMethodTest::testTellWaiting()
CPPUNIT_ASSERT_EQUAL(0, res.code); CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param); resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)3, resParams->size()); CPPUNIT_ASSERT_EQUAL((size_t)3, resParams->size());
// offset = INT32_MAX
req.params->set(0, Integer::g(INT32_MAX));
req.params->set(1, Integer::g(1));
res = m.execute(req, e_.get());
CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)0, resParams->size());
// num = INT32_MAX
req.params->set(0, Integer::g(1));
req.params->set(1, Integer::g(INT32_MAX));
res = m.execute(req, e_.get());
CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)3, resParams->size());
// offset=INT32_MAX and num = INT32_MAX
req.params->set(0, Integer::g(INT32_MAX));
req.params->set(1, Integer::g(INT32_MAX));
res = m.execute(req, e_.get());
CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)0, resParams->size());
// offset=INT32_MIN and num = INT32_MAX
req.params->set(0, Integer::g(INT32_MIN));
req.params->set(1, Integer::g(INT32_MAX));
res = m.execute(req, e_.get());
CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)0, resParams->size());
// negative offset // negative offset
req = RpcRequest(TellWaitingRpcMethod::getMethodName(), List::g()); req = RpcRequest(TellWaitingRpcMethod::getMethodName(), List::g());
req.params->append(Integer::g(-1)); req.params->append(Integer::g(-1));