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

Use size_t for the arguments to malloc.

Browse source
This commit is contained in:
Ms2ger 2015-04-07 17:56:46 +02:00
parent 6d1cde2283
commit 9ddaf82d47
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/cef/wrappers.rs
View file

@ -245,14 +245,14 @@ impl<'a> CefWrap<cef_string_userfree_t> for String {
let boxed_string; let boxed_string;
unsafe { unsafe {
let buffer = libc::malloc((mem::size_of::<c_ushort>() as u64) * let buffer = libc::malloc((mem::size_of::<c_ushort>() as libc::size_t) *
((utf16_chars.len() + 1) as u64)) as *mut u16; ((utf16_chars.len() + 1) as libc::size_t)) as *mut u16;
for (i, ch) in utf16_chars.iter().enumerate() { for (i, ch) in utf16_chars.iter().enumerate() {
*buffer.offset(i as int) = *ch *buffer.offset(i as int) = *ch
} }
*buffer.offset(utf16_chars.len() as int) = 0; *buffer.offset(utf16_chars.len() as int) = 0;
boxed_string = libc::malloc(mem::size_of::<cef_string_utf16>() as u64) as boxed_string = libc::malloc(mem::size_of::<cef_string_utf16>() as libc::size_t) as
*mut cef_string_utf16; *mut cef_string_utf16;
ptr::write(&mut (*boxed_string).str, buffer); ptr::write(&mut (*boxed_string).str, buffer);
ptr::write(&mut (*boxed_string).length, utf16_chars.len() as u64); ptr::write(&mut (*boxed_string).length, utf16_chars.len() as u64);