From fec36de94e02e9c7c6fec05a2aea32bfbdc2f0f8 Mon Sep 17 00:00:00 2001
From: Kevin Cantu <me@kevincantu.org>
Date: Wed, 25 Jan 2012 02:25:57 -0800
Subject: [PATCH] Making str::from_cstr UTF-8 safe

---
 src/libcore/str.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 36453d78c98..b8d9a1dea11 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -217,16 +217,16 @@ Function: from_cstr
 Create a Rust string from a null-terminated C string
 */
 unsafe fn from_cstr(cstr: sbuf) -> str {
-    let res = "";
+    let res = [];
     let start = cstr;
     let curr = start;
     let i = 0u;
     while *curr != 0u8 {
-        push_byte(res, *curr);
+        vec::push(res, *curr);
         i += 1u;
         curr = ptr::offset(start, i);
     }
-    ret res;
+    ret from_bytes(res);
 }
 
 /*