update

1 files changed, 29 insertions, 0 deletions

diff --git a/ps-issue-515_all.patch b/ps-issue-515_all.patch
new file mode 100644
index 000000000000..cd820cb22361
--- /dev/null
+++ b/ps-issue-515_all.patch
@@ -0,0 +1,29 @@
+--- a/src/rpc/command_scheduler.cc
++++ b/src/rpc/command_scheduler.cc
+@@ -63,15 +63,18 @@ CommandScheduler::insert(const std::string& key) {
+   if (key.empty())
+     throw torrent::input_error("Scheduler received an empty key.");
+ 
+-  iterator itr = find(key);
++  CommandSchedulerItem* current = new CommandSchedulerItem(key);
++  current->slot() = std::tr1::bind(&CommandScheduler::call_item, this, current);
+ 
+-  if (itr == end())
+-    itr = base_type::insert(end(), NULL);
+-  else
+-    delete *itr;
+-
+-  *itr = new CommandSchedulerItem(key);
+-  (*itr)->slot() = std::tr1::bind(&CommandScheduler::call_item, this, *itr);
++  iterator itr = find(key);
++  if (itr == end()) {
++    itr = base_type::insert(end(), current);
++  } else {
++    // swap in fully initialized command, and THEN delete the replaced one
++    CommandSchedulerItem* old = *itr;
++    *itr = current;
++    delete old;
++  }
+ 
+   return itr;
+ }