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

2009-05-22 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Made exception message more verbose.
	* src/bencode.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-05-22 12:27:17 +00:00
parent a839b42747
commit 4259514395
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-05-22 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made exception message more verbose.
* src/bencode.cc
2009-05-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-05-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Abbreviated KiB/s to KiBs and its precision decreased to 1 to save Abbreviated KiB/s to KiBs and its precision decreased to 1 to save

24
src/bencode.cc
View File

@ -51,7 +51,8 @@ static void checkdelim(std::istream& ss, const char delim = ':')
char d; char d;
if(!(ss.get(d) && d == delim)) { if(!(ss.get(d) && d == delim)) {
throw DL_ABORT_EX throw DL_ABORT_EX
(StringFormat("Delimiter '%c' not found.", delim).str()); (StringFormat("Bencode decoding failed: Delimiter '%c' not found.",
delim).str());
} }
} }
@ -60,7 +61,8 @@ static std::string decoderawstring(std::istream& ss)
int length; int length;
ss >> length; ss >> length;
if(!ss || length < 0) { if(!ss || length < 0) {
throw DL_ABORT_EX("A positive integer expected but none found."); throw DL_ABORT_EX("Bencode decoding failed:"
" A positive integer expected but none found.");
} }
// TODO check length, it must be less than or equal to INT_MAX // TODO check length, it must be less than or equal to INT_MAX
checkdelim(ss); checkdelim(ss);
@ -70,7 +72,8 @@ static std::string decoderawstring(std::istream& ss)
delete [] buf; delete [] buf;
if(ss.gcount() != static_cast<int>(length)) { if(ss.gcount() != static_cast<int>(length)) {
throw DL_ABORT_EX throw DL_ABORT_EX
(StringFormat("Expected %lu bytes of data, but only %d read.", (StringFormat("Bencode decoding failed:"
" Expected %lu bytes of data, but only %d read.",
static_cast<unsigned long>(length), ss.gcount()).str()); static_cast<unsigned long>(length), ss.gcount()).str());
} }
return str; return str;
@ -86,7 +89,8 @@ static BDE decodeinteger(std::istream& ss)
BDE::Integer integer; BDE::Integer integer;
ss >> integer; ss >> integer;
if(!ss) { if(!ss) {
throw DL_ABORT_EX("Integer expected but none found"); throw DL_ABORT_EX("Bencode decoding failed:"
" Integer expected but none found");
} }
checkdelim(ss, 'e'); checkdelim(ss, 'e');
return BDE(integer); return BDE(integer);
@ -105,7 +109,8 @@ static BDE decodedict(std::istream& ss)
dict[key] = decodeiter(ss); dict[key] = decodeiter(ss);
} }
} }
throw DL_ABORT_EX("Unexpected EOF in dict context. 'e' expected."); throw DL_ABORT_EX("Bencode decoding failed:"
" Unexpected EOF in dict context. 'e' expected.");
} }
static BDE decodelist(std::istream& ss) static BDE decodelist(std::istream& ss)
@ -120,14 +125,16 @@ static BDE decodelist(std::istream& ss)
list << decodeiter(ss); list << decodeiter(ss);
} }
} }
throw DL_ABORT_EX("Unexpected EOF in list context. 'e' expected."); throw DL_ABORT_EX("Bencode decoding failed:"
" Unexpected EOF in list context. 'e' expected.");
} }
static BDE decodeiter(std::istream& ss) static BDE decodeiter(std::istream& ss)
{ {
char c; char c;
if(!ss.get(c)) { if(!ss.get(c)) {
throw DL_ABORT_EX("Unexpected EOF in term context." throw DL_ABORT_EX("Bencode decoding failed:"
" Unexpected EOF in term context."
" 'd', 'l', 'i' or digit is expected."); " 'd', 'l', 'i' or digit is expected.");
} }
if(c == 'd') { if(c == 'd') {
@ -169,7 +176,8 @@ BDE decodeFromFile(const std::string& filename)
return decode(f); return decode(f);
} else { } else {
throw DL_ABORT_EX throw DL_ABORT_EX
(StringFormat("Cannot open file '%s'.", filename.c_str()).str()); (StringFormat("Bencode decoding failed:"
" Cannot open file '%s'.", filename.c_str()).str());
} }
} }