---

erickt · erickt · commit a277c4fe303c · 2013-08-07T14:06:50.000-07:00
yaml --- r: 143806 b: refs/heads/try2 c: aababbb h: refs/heads/master v: v3
diff --git a/[refs] b/[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: 72688eaa132403fcb5f103cb13756ef50ed804c0
+refs/heads/try2: aababbba8e5d5b56aa4a0cedb9b2008ba6cdc422
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/c_str.rs b/branches/try2/src/libstd/c_str.rs
@@ -124,7 +124,7 @@ impl<'self> ToCStr for &'self [u8] {
     fn to_c_str(&self) -> CString {
         do self.as_imm_buf |self_buf, self_len| {
             unsafe {
-                let buf = libc::malloc(self_len as u64 + 1) as *mut u8;
+                let buf = libc::malloc(self_len as libc::size_t + 1) as *mut u8;
                 if buf.is_null() {
                     fail!("failed to allocate memory!");
                 }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ impl<'self> ToCStr for &'self [u8] {`
`124`	`124`	`fn to_c_str(&self) -> CString {`
`125`	`125`	`do self.as_imm_buf \|self_buf, self_len\| {`
`126`	`126`	`unsafe {`
`127`		`- let buf = libc::malloc(self_len as u64 + 1) as *mut u8;`
	`127`	`+ let buf = libc::malloc(self_len as libc::size_t + 1) as *mut u8;`
`128`	`128`	`if buf.is_null() {`
`129`	`129`	`fail!("failed to allocate memory!");`
`130`	`130`	`}`