fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-10 08:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use intermediate std::string to store the arguments to work around a possible bug.

Browse Source
This commit is contained in:
rakshasa
2012-02-13 17:15:54 +09:00
parent 8ed8ee9f81
commit 4f601fda79
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_ip.cc
+9 -7
View File
@@ -197,12 +197,14 @@ apply_ipv4_filter_load(const torrent::Object::list_type& args) {
if (args.size() != 2) if (args.size() != 2)
throw torrent::input_error("Incorrect number of arguments."); throw torrent::input_error("Incorrect number of arguments.");
std::fstream file(rak::path_expand(args.front().as_string()).c_str(), std::ios::in); std::string filename = args.front().as_string();
std::string value_name = args.back().as_string();
int value = torrent::option_find_string(torrent::OPTION_IP_FILTER, value_name.c_str());
std::fstream file(rak::path_expand(filename).c_str(), std::ios::in);
if (!file.is_open()) if (!file.is_open())
throw torrent::input_error("Could not open ip filter file: " + args.front().as_string()); throw torrent::input_error("Could not open ip filter file: " + filename);
int value = torrent::option_find_string(torrent::OPTION_IP_FILTER, args.back().as_string().c_str());
char buffer[4096]; char buffer[4096];
unsigned int lineNumber = 0; unsigned int lineNumber = 0;
@@ -228,16 +230,16 @@ apply_ipv4_filter_load(const torrent::Object::list_type& args) {
} }
} catch (torrent::input_error& e) { } catch (torrent::input_error& e) {
snprintf(buffer, 2048, "Error in ip filter file: %s:%u: %s", args.front().as_string().c_str(), lineNumber, e.what()); snprintf(buffer, 2048, "Error in ip filter file: %s:%u: %s", filename.c_str(), lineNumber, e.what());
throw torrent::input_error(buffer); throw torrent::input_error(buffer);
} }
lt_log_print(torrent::LOG_CONNECTION_INFO, "Loaded %u %s address blocks (%u kb in-memory) from '%s'.", lt_log_print(torrent::LOG_CONNECTION_INFO, "Loaded %u %s address blocks (%u kb in-memory) from '%s'.",
lineNumber, lineNumber,
args.back().as_string().c_str(), value_name.c_str(),
torrent::PeerList::ipv4_filter()->sizeof_data() / 1024, torrent::PeerList::ipv4_filter()->sizeof_data() / 1024,
args.front().as_string().c_str()); filename.c_str());
return torrent::Object(); return torrent::Object();
} }