Merge pull request rust-lang#84 from cdisselkoen/memorybuffer-create_from_file-bugfix

TheDan64 · web-flow · commit 712793e445bf · 2019-06-20T08:51:40.000-04:00
bugfix: use CString when passing path across FFI
diff --git a/src/memory_buffer.rs b/src/memory_buffer.rs
@@ -26,7 +26,7 @@ impl MemoryBuffer {
     }
 
     pub fn create_from_file(path: &Path) -> Result<Self, LLVMString> {
-        let path = path.to_str().expect("Did not find a valid Unicode path string");
+        let path = CString::new(path.to_str().expect("Did not find a valid Unicode path string")).expect("Failed to convert to CString");
         let mut memory_buffer = ptr::null_mut();
         let mut err_string = unsafe { zeroed() };
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl MemoryBuffer {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pub fn create_from_file(path: &Path) -> Result<Self, LLVMString> {`
`29`		`- let path = path.to_str().expect("Did not find a valid Unicode path string");`
	`29`	`+ let path = CString::new(path.to_str().expect("Did not find a valid Unicode path string")).expect("Failed to convert to CString");`
`30`	`30`	`let mut memory_buffer = ptr::null_mut();`
`31`	`31`	`let mut err_string = unsafe { zeroed() };`
`32`	`32`