---

yaml
---
r: 39789
b: refs/heads/incoming
c: 8367589
h: refs/heads/master
i:
  39787: be3733d
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: b71381dcc9c7393dec2f45267c538ff126893120
+refs/heads/incoming: 83675895af7c6af80cc8a4f5cec4e565dc829fca
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -106,27 +106,29 @@ pub mod win32 {
 
     pub fn fill_utf16_buf_and_decode(f: fn(*mut u16, DWORD) -> DWORD)
         -> Option<~str> {
-        let mut n = tmpbuf_sz as DWORD;
-        let mut res = None;
-        let mut done = false;
-        while !done {
-            let buf = vec::to_mut(vec::from_elem(n as uint, 0u16));
-            do vec::as_mut_buf(buf) |b, _sz| {
-                let k : DWORD = f(b, tmpbuf_sz as DWORD);
-                if k == (0 as DWORD) {
-                    done = true;
-                } else if (k == n &&
-                           libc::GetLastError() ==
-                           libc::ERROR_INSUFFICIENT_BUFFER as DWORD) {
-                    n *= (2 as DWORD);
-                } else {
-                    let sub = vec::slice(buf, 0u, k as uint);
-                    res = option::Some(str::from_utf16(sub));
-                    done = true;
+        unsafe {
+            let mut n = tmpbuf_sz as DWORD;
+            let mut res = None;
+            let mut done = false;
+            while !done {
+                let buf = vec::to_mut(vec::from_elem(n as uint, 0u16));
+                do vec::as_mut_buf(buf) |b, _sz| {
+                    let k : DWORD = f(b, tmpbuf_sz as DWORD);
+                    if k == (0 as DWORD) {
+                        done = true;
+                    } else if (k == n &&
+                               libc::GetLastError() ==
+                               libc::ERROR_INSUFFICIENT_BUFFER as DWORD) {
+                        n *= (2 as DWORD);
+                    } else {
+                        let sub = vec::slice(buf, 0u, k as uint);
+                        res = option::Some(str::from_utf16(sub));
+                        done = true;
+                    }
                 }
             }
+            return res;
         }
-        return res;
     }
 
     pub fn as_utf16_p<T>(s: &str, f: fn(*u16) -> T) -> T {