---

yaml
---
r: 153745
b: refs/heads/try2
c: 1031ad8
h: refs/heads/master
i:
  153743: 5c4bb79
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: dff14069c966ad4e4c453a84a42579a846d4863b
+refs/heads/try2: 1031ad8f709839a4d34045c6b116704e639f5cbe
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnative/io/addrinfo.rs

@@ -27,7 +27,9 @@ impl GetAddrInfoRequest {
         assert!(host.is_some() || servname.is_some());
 
         let c_host = host.map(|x| x.to_c_str());
+        let c_host = c_host.as_ref().map(|x| x.as_ptr()).unwrap_or(null());
         let c_serv = servname.map(|x| x.to_c_str());
+        let c_serv = c_serv.as_ref().map(|x| x.as_ptr()).unwrap_or(null());
 
         let hint = hint.map(|hint| {
             libc::addrinfo {
@@ -49,9 +51,7 @@ impl GetAddrInfoRequest {
 
         // Make the call
         let s = unsafe {
-            let ch = if c_host.is_none() { null() } else { c_host.unwrap().as_ptr() };
-            let cs = if c_serv.is_none() { null() } else { c_serv.unwrap().as_ptr() };
-            getaddrinfo(ch, cs, hint_ptr, &mut res)
+            getaddrinfo(c_host, c_serv, hint_ptr, &mut res)
         };
 
         // Error?