Fix leaks in mojo::edk::NodeController

mojo/edk/system/node_controller.cc

Index: mojo/edk/system/node_controller.cc
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index cafd604d1cb36d78a017eee4edb3af5d3d4a33c6..9c8bb95e1de7a26a521cfa87d9448f6a0b17e0eb 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -712,6 +712,9 @@ void NodeController::SendPeerMessage(const ports::NodeName& name,
     scoped_refptr<NodeChannel> broker = GetBrokerChannel();
     if (!broker) {
       DVLOG(1) << "Dropping message for unknown peer: " << name;
+
+      base::AutoLock lock(peers_lock_);
+      pending_peer_messages_.erase(name);
       return;
     }
     broker->RequestIntroduction(name);
@@ -937,6 +940,16 @@ void NodeController::OnAcceptParent(const ports::NodeName& from_node,
     return;
   }
 
+  {
+    base::AutoLock lock(reserved_ports_lock_);
+    auto it = pending_child_tokens_.find(from_node);
+    if (it != pending_child_tokens_.end()) {
+      std::string token = std::move(it->second);
+      pending_child_tokens_.erase(it);
+      pending_child_tokens_[child_name] = std::move(token);
+    }
+  }
+
   scoped_refptr<NodeChannel> channel = it->second;
   pending_children_.erase(it);
 
@@ -1155,6 +1168,7 @@ void NodeController::OnRequestPortMerge(
       return;
     }
     local_port = it->second.port;
+    reserved_ports_.erase(it);
   }
 
   int rv = node_->MergePorts(local_port, from_node, connector_port_name);