jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed memory scope issue in python binding when adding torrents with resume data

Browse Source
This commit is contained in:
Arvid Norberg
2011-06-01 03:22:41 +00:00
parent 5e7b2fad97
commit 1a03764d5f
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bindings/python/src/session.cpp
View File

@@ -142,7 +142,7 @@ namespace
#endif #endif
#endif #endif
void dict_to_add_torrent_params(dict params, add_torrent_params& p) void dict_to_add_torrent_params(dict params, add_torrent_params& p, std::vector<char>& rd)
{ {
if (params.has_key("ti")) if (params.has_key("ti"))
p.ti = new torrent_info(extract<torrent_info const&>(params["ti"])); p.ti = new torrent_info(extract<torrent_info const&>(params["ti"]));
@@ -163,13 +163,12 @@ namespace
} }
p.save_path = extract<std::string>(params["save_path"]); p.save_path = extract<std::string>(params["save_path"]);
std::vector<char> resume_buf;
if (params.has_key("resume_data")) if (params.has_key("resume_data"))
{ {
std::string resume = extract<std::string>(params["resume_data"]); std::string resume = extract<std::string>(params["resume_data"]);
resume_buf.resize(resume.size()); rd.resize(resume.size());
std::memcpy(&resume_buf[0], &resume[0], resume.size()); std::memcpy(&rd[0], &rd[0], rd.size());
p.resume_data = &resume_buf; p.resume_data = &rd;
} }
if (params.has_key("storage_mode")) if (params.has_key("storage_mode"))
p.storage_mode = extract<storage_mode_t>(params["storage_mode"]); p.storage_mode = extract<storage_mode_t>(params["storage_mode"]);
@@ -198,7 +197,8 @@ namespace
torrent_handle add_torrent(session& s, dict params) torrent_handle add_torrent(session& s, dict params)
{ {
add_torrent_params p; add_torrent_params p;
dict_to_add_torrent_params(params, p); std::vector<char> resume_buf;
dict_to_add_torrent_params(params, p, resume_buf);
allow_threading_guard guard; allow_threading_guard guard;
@@ -210,7 +210,7 @@ namespace
#endif #endif
} }
void dict_to_feed_settings(dict params, feed_settings& feed) void dict_to_feed_settings(dict params, feed_settings& feed, std::vector<char>& resume_buf)
{ {
if (params.has_key("auto_download")) if (params.has_key("auto_download"))
feed.auto_download = extract<bool>(params["auto_download"]); feed.auto_download = extract<bool>(params["auto_download"]);
@@ -219,7 +219,7 @@ namespace
if (params.has_key("url")) if (params.has_key("url"))
feed.url = extract<std::string>(params["url"]); feed.url = extract<std::string>(params["url"]);
if (params.has_key("add_args")) if (params.has_key("add_args"))
dict_to_add_torrent_params(dict(params["add_args"]), feed.add_args); dict_to_add_torrent_params(dict(params["add_args"]), feed.add_args, resume_buf);
} }
feed_handle add_feed(session& s, dict params) feed_handle add_feed(session& s, dict params)
@@ -227,7 +227,10 @@ namespace
allow_threading_guard guard; allow_threading_guard guard;
feed_settings feed; feed_settings feed;
dict_to_feed_settings(params, feed); // this static here is a bit of a hack. It will
// probably work for the most part
static std::vector<char> resume_buf;
dict_to_feed_settings(params, feed, resume_buf);
return s.add_feed(feed); return s.add_feed(feed);
} }
@@ -272,7 +275,8 @@ namespace
allow_threading_guard guard; allow_threading_guard guard;
feed_settings feed; feed_settings feed;
dict_to_feed_settings(sett, feed); static std::vector<char> resume_buf;
dict_to_feed_settings(sett, feed, resume_buf);
h.set_settings(feed); h.set_settings(feed);
} }