wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #288 from ssiloti/master 

fix segfault in put_data
This commit is contained in:
Arvid Norberg 2015-11-22 23:20:34 -05:00
parent adb70a8dc3 9c7edf803e
commit 5cedf781a1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libtorrent/kademlia/put_data.hpp
View File

@ -58,6 +58,7 @@ struct put_data: traversal_algorithm
put_data(node& node, put_callback const& callback); put_data(node& node, put_callback const& callback);
virtual char const* name() const; virtual char const* name() const;
virtual void start() TORRENT_OVERRIDE;
void set_data(item const& data) { m_data = data; } void set_data(item const& data) { m_data = data; }

11
src/kademlia/put_data.cpp
View File

@ -47,6 +47,14 @@ put_data::put_data(node& dht_node, put_callback const& callback)
char const* put_data::name() const { return "put_data"; } char const* put_data::name() const { return "put_data"; }
void put_data::start()
{
// router nodes must not be added to puts
init();
bool is_done = add_requests();
if (is_done) done();
}
void put_data::set_targets(std::vector<std::pair<node_entry, std::string> > const& targets) void put_data::set_targets(std::vector<std::pair<node_entry, std::string> > const& targets)
{ {
for (std::vector<std::pair<node_entry, std::string> >::const_iterator i = targets.begin() for (std::vector<std::pair<node_entry, std::string> >::const_iterator i = targets.begin()
@ -85,6 +93,9 @@ bool put_data::invoke(observer_ptr o)
m_invoke_count = -1; m_invoke_count = -1;
return false; return false;
} }
// TODO: what if o is not an isntance of put_data_observer? This need to be
// redesigned for better type saftey.
put_data_observer* po = static_cast<put_data_observer*>(o.get()); put_data_observer* po = static_cast<put_data_observer*>(o.get());
entry e; entry e;