Merge pull request ceph#12266: hammer: msgr: simple/Pipe: error decod…

…ing addr Reviewed-by: Nathan Cutler <ncutler@suse.com>
SUSE · Dec 13, 2016 · 63fdabe · 63fdabe
2 parents f75e4fd + 92de2fd
commit 63fdabe
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
@@ -959,12 +959,17 @@ int Pipe::connect()
     ldout(msgr->cct,2) << "connect couldn't read peer addrs, " << cpp_strerror(errno) << dendl;
     goto fail;
   }
-  {
+  try {
     bufferlist::iterator p = addrbl.begin();
     ::decode(paddr, p);
     ::decode(peer_addr_for_me, p);
-    port = peer_addr_for_me.get_port();
   }
+  catch (buffer::error& e) {
+    ldout(msgr->cct,2) << "connect couldn't decode peer addrs: " << e.what()
+		       << dendl;
+    goto fail;
+  }
+  port = peer_addr_for_me.get_port();
 
   ldout(msgr->cct,20) << "connect read peer addr " << paddr << " on socket " << sd << dendl;
   if (peer_addr != paddr) {