fix flora service crash

call reply should check caller if disconnected
yodaos-project · Jul 12, 2019 · aae9244 · aae9244
1 parent 9ccd8f5
commit aae9244
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/disp.cc b/src/disp.cc
@@ -502,6 +502,11 @@ bool Dispatcher::handle_reply_req(shared_ptr<Caps> &msg_caps,
           sender->info->name.c_str(), svrid);
     return true;
   }
+  if (it->sender->closed()) {
+    KLOGI(TAG, "<<< %s: reply %d failed. caller disconnected",
+        sender->info->name.c_str(), svrid);
+    return true;
+  }
   Response resp;
   resp.ret_code = ret_code;
   resp.data = data;

diff --git a/src/sock-poll.cc b/src/sock-poll.cc
@@ -276,11 +276,11 @@ shared_ptr<Adapter> SocketPoll::new_adapter(int fd) {
 }
 
 void SocketPoll::delete_adapter(shared_ptr<Adapter> &adap) {
-  dispatcher->erase_adapter(adap);
   int fd = static_pointer_cast<SocketAdapter>(adap)->socket();
   adap->close();
   FD_CLR(fd, &all_fds);
   ::close(fd);
+  dispatcher->erase_adapter(adap);
 }
 
 bool SocketPoll::do_read(shared_ptr<Adapter> &adap) {