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

Fix bad use of std::move 

In the original code, std::move(cookieDomain) may be performed before
util::isNumericHost(cookieDomain), which is unintentional.
pull/119/head
Tatsuhiro Tsujikawa 2013-08-19 23:29:08 +09:00
parent 7e01328daf
commit 7f049dc2a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Sqlite3CookieParser.cc
View File

@ -122,13 +122,14 @@ int cookieRowMapper(void* data, int columns, char** values, char** names)
if(!values[6] || !parseTime(lastAccessTime, values[6])) { if(!values[6] || !parseTime(lastAccessTime, values[6])) {
return 0; return 0;
} }
bool numericHost = util::isNumericHost(cookieDomain);
cookies.push_back(make_unique<Cookie> cookies.push_back(make_unique<Cookie>
(std::move(cookieName), (std::move(cookieName),
toString(values[5]), // value toString(values[5]), // value
expiryTime, expiryTime,
true, // persistent true, // persistent
std::move(cookieDomain), std::move(cookieDomain),
util::isNumericHost(cookieDomain) || numericHost ||
(values[0] && values[0][0] != '.'), // hostOnly (values[0] && values[0][0] != '.'), // hostOnly
std::move(cookiePath), std::move(cookiePath),
values[2] && strcmp(values[2], "1") == 0, //secure values[2] && strcmp(values[2], "1") == 0, //secure