Fix CString/CStr bug which was causing memory corruption in previous update

s2172861 · s2172861 · commit 591be39f1854 · 2015-08-18T23:51:53.000+10:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -155,7 +155,7 @@ impl Request for DefaultRequest {
             if param.is_null() {
                 return None;
             }
-            let result_cstr = ffi::CString::from_ptr(param);
+            let result_cstr = ffi::CStr::from_ptr(param);
             let result_str = result_cstr.to_str().unwrap();
             return Some(String::from(result_str));
         }
@@ -182,7 +182,7 @@ impl Request for DefaultRequest {
             let pdst = buffer.as_mut_ptr();
             let byte_count = capi::FCGX_GetStr(pdst, n, self.raw_request.in_stream);
             buffer.set_len(byte_count as usize);
-            let result_cstr = ffi::CString::from_ptr(pdst);
+            let result_cstr = ffi::CStr::from_ptr(pdst);
             let result_str = result_cstr.to_str().unwrap();
             return (String::from(result_str), byte_count);
         }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ impl Request for DefaultRequest {`
`155`	`155`	`if param.is_null() {`
`156`	`156`	`return None;`
`157`	`157`	`}`
`158`		`- let result_cstr = ffi::CString::from_ptr(param);`
	`158`	`+ let result_cstr = ffi::CStr::from_ptr(param);`
`159`	`159`	`let result_str = result_cstr.to_str().unwrap();`
`160`	`160`	`return Some(String::from(result_str));`
`161`	`161`	`}`
`@@ -182,7 +182,7 @@ impl Request for DefaultRequest {`
`182`	`182`	`let pdst = buffer.as_mut_ptr();`
`183`	`183`	`let byte_count = capi::FCGX_GetStr(pdst, n, self.raw_request.in_stream);`
`184`	`184`	`buffer.set_len(byte_count as usize);`
`185`		`- let result_cstr = ffi::CString::from_ptr(pdst);`
	`185`	`+ let result_cstr = ffi::CStr::from_ptr(pdst);`
`186`	`186`	`let result_str = result_cstr.to_str().unwrap();`
`187`	`187`	`return (String::from(result_str), byte_count);`
`188`	`188`	`}`