Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Box and boxed functions to manage cef_string_list_t memory.

Browse source
This commit is contained in:
Ms2ger 2015-06-20 13:38:04 +02:00
parent 611a0cd117
commit 2248e1710a
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ports/cef/string_list.rs
View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use libc::{c_int}; use libc::{c_int};
use std::boxed;
use std::mem; use std::mem;
use std::slice; use std::slice;
use string::cef_string_utf16_set; use string::cef_string_utf16_set;
@ -18,10 +19,7 @@ fn string_list_to_vec(lt: *mut cef_string_list_t) -> *mut Vec<String> {
#[no_mangle] #[no_mangle]
pub extern "C" fn cef_string_list_alloc() -> *mut cef_string_list_t { pub extern "C" fn cef_string_list_alloc() -> *mut cef_string_list_t {
unsafe { boxed::into_raw(box vec!())
let lt: Box<Vec<String>> = box vec!();
mem::transmute(lt)
}
} }
#[no_mangle] #[no_mangle]
@ -67,9 +65,8 @@ pub extern "C" fn cef_string_list_clear(lt: *mut cef_string_list_t) {
pub extern "C" fn cef_string_list_free(lt: *mut cef_string_list_t) { pub extern "C" fn cef_string_list_free(lt: *mut cef_string_list_t) {
unsafe { unsafe {
if lt.is_null() { return; } if lt.is_null() { return; }
let v: Box<Vec<String>> = mem::transmute(lt);
cef_string_list_clear(lt); cef_string_list_clear(lt);
drop(v); drop(Box::from_raw(lt));
} }
} }
@ -79,6 +76,6 @@ pub extern "C" fn cef_string_list_copy(lt: *mut cef_string_list_t) -> *mut cef_s
if lt.is_null() { return 0 as *mut cef_string_list_t; } if lt.is_null() { return 0 as *mut cef_string_list_t; }
let v = string_list_to_vec(lt); let v = string_list_to_vec(lt);
let copy = (*v).clone(); let copy = (*v).clone();
mem::transmute(box copy) boxed::into_raw(box copy)
} }
} }