From 3800a77a85277d13b2ef1191a7e6a4117d210cd3 Mon Sep 17 00:00:00 2001
From: Esption <esption@gmail.com>
Date: Sun, 2 Aug 2015 01:00:36 -0500
Subject: [PATCH] Maybe fixed a crash due to unwrap

---
 src/lib.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 3704ee3..fc5e725 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -414,10 +414,10 @@ impl Request {
         loop {
             match try!(Record::receive(&mut sock)) {
                 Record::UnknownType(rec_type) => {
-                    Record::UnknownType(rec_type).send(&mut sock).unwrap();
+                    Record::UnknownType(rec_type).send(&mut sock).unwrap_or(());
                 },
                 Record::GetValues(keys) => {
-                    Record::GetValuesResult(get_values(keys)).send(&mut sock).unwrap();
+                    Record::GetValuesResult(get_values(keys)).send(&mut sock).unwrap_or(());
                 },
                 Record::BeginRequest { request_id, role: Ok(role), keep_conn } => {
                     return Ok((request_id, role, keep_conn));
@@ -470,7 +470,7 @@ impl Request {
                         continue;
                     }
                     if content.is_empty() {
-                        params.extend(read_pairs(&mut Cursor::new(buf.as_ref())).unwrap());
+                        params.extend(try!(read_pairs(&mut Cursor::new(buf.as_ref()))));
                         break;
                     } else {
                         buf.extend(content);
@@ -547,16 +547,16 @@ impl Drop for Request {
         Record::Stdout {
             request_id: self.id,
             content: Vec::new(),
-        }.send(&mut &*self.sock).unwrap();
+        }.send(&mut &*self.sock).unwrap_or(());
         Record::Stderr {
             request_id: self.id,
             content: Vec::new()
-        }.send(&mut &*self.sock).unwrap();
+        }.send(&mut &*self.sock).unwrap_or(());
         Record::EndRequest {
             request_id: self.id,
             app_status: self.status,
             protocol_status: ProtocolStatus::RequestComplete,
-        }.send(&mut &*self.sock).unwrap();
+        }.send(&mut &*self.sock).unwrap_or(());
     }
 }
 
@@ -571,8 +571,12 @@ fn run_transport<F>(mut handler: F, transport: &mut Transport) where F: FnMut(Re
             Ok(sock) => sock,
             Err(e) => panic!(e.to_string()),
         };
+		let t = match sock.peer() {
+			Ok(e)  => e,
+			Err(_) => return
+		};
         let allow = match addrs {
-            Some(ref addrs) => addrs.contains(&sock.peer().unwrap()),
+            Some(ref addrs) => addrs.contains(&t),
             None => true,
         };
         if allow {