Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop using CString::from_slice in redirect_output.

Browse source 
It will panic if there are any null bytes in read_buffer, but fgets
guarantees that there is a null-terminator.
This commit is contained in:
Ms2ger 2015-03-20 15:49:57 +01:00
parent 2c85c1d312
commit acafcacfdc
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/servo/main.rs
View file

@ -88,9 +88,8 @@ fn redirect_output(file_no: c_int) {
let mut read_buffer: [u8; 1024] = mem::zeroed(); let mut read_buffer: [u8; 1024] = mem::zeroed();
let FilePtr(input_file) = input_file; let FilePtr(input_file) = input_file;
fgets(read_buffer.as_mut_ptr() as *mut i8, read_buffer.len() as i32, input_file); fgets(read_buffer.as_mut_ptr() as *mut i8, read_buffer.len() as i32, input_file);
let cs = CString::from_slice(&read_buffer); match from_utf8(&read_buffer) {
match from_utf8(cs.as_bytes()) { Ok(s) => android_glue::write_log(s.trim_right_matches('\0')),
Ok(s) => android_glue::write_log(s),
_ => {} _ => {}
} }
} }