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

2010-11-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed compile error on opensolaris
	* src/util.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-11-14 08:19:53 +00:00
parent af33f67fee
commit ba540085a6
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-11-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed compile error on opensolaris
* src/util.cc
2010-11-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-11-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Don't catch Exception. Don't catch Exception.

28
src/util.cc
View File

@ -1339,24 +1339,24 @@ bool detectDirTraversal(const std::string& s)
} }
} }
static std::string DS = "./"; static std::string A2_DS = "./";
static std::string DDS = "../"; static std::string A2_DDS = "../";
static std::string SD = "/."; static std::string A2_SD = "/.";
static std::string SDD = "/.."; static std::string A2_SDD = "/..";
static std::string SDDS = "/../"; static std::string A2_SDDS = "/../";
static std::string SDS = "/./"; static std::string A2_SDS = "/./";
static std::string DD = ".."; static std::string A2_DD = "..";
return s == A2STR::DOT_C || return s == A2STR::DOT_C ||
s == DD || s == A2_DD ||
util::startsWith(s, A2STR::SLASH_C) || util::startsWith(s, A2STR::SLASH_C) ||
util::startsWith(s, DS) || util::startsWith(s, A2_DS) ||
util::startsWith(s, DDS) || util::startsWith(s, A2_DDS) ||
s.find(SDDS) != std::string::npos || s.find(A2_SDDS) != std::string::npos ||
s.find(SDS) != std::string::npos || s.find(A2_SDS) != std::string::npos ||
util::endsWith(s, A2STR::SLASH_C) || util::endsWith(s, A2STR::SLASH_C) ||
util::endsWith(s, SD) || util::endsWith(s, A2_SD) ||
util::endsWith(s, SDD); util::endsWith(s, A2_SDD);
} }
std::string escapePath(const std::string& s) std::string escapePath(const std::string& s)