hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leaks (#28)

Browse Source
This commit is contained in:
daa 2017-12-03 19:45:38 +03:00
parent 2565b1e0fe
commit 778884ea96
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sys/pango/attr_iterator.rs
View File

@ -23,7 +23,7 @@ pub trait AttrIteratorFactory {
impl AttrIteratorFactory for pango::AttrList { impl AttrIteratorFactory for pango::AttrList {
fn get_iterator(&self) -> AttrIterator { fn get_iterator(&self) -> AttrIterator {
unsafe { unsafe {
from_glib_none(pango_sys::pango_attr_list_get_iterator( from_glib_full(pango_sys::pango_attr_list_get_iterator(
self.to_glib_none().0, self.to_glib_none().0,
)) ))
} }

2
src/sys/pango/item.rs
View File

@ -23,7 +23,7 @@ impl Item {
#[cfg(test)] #[cfg(test)]
pub fn new() -> Self { pub fn new() -> Self {
unsafe { unsafe {
from_glib_none(pango_sys::pango_item_new()) from_glib_full(pango_sys::pango_item_new())
} }
} }

10
src/sys/pango/mod.rs
View File

@ -10,6 +10,7 @@ use std::ptr;
use pango; use pango;
use pango_sys; use pango_sys;
use glib_ffi;
use glib::translate::*; use glib::translate::*;
@ -22,7 +23,8 @@ pub fn pango_itemize(
cached_iter: Option<&mut AttrIterator>, cached_iter: Option<&mut AttrIterator>,
) -> Vec<Item> { ) -> Vec<Item> {
unsafe { unsafe {
FromGlibPtrContainer::from_glib_container(pango_sys::pango_itemize( //FromGlibPtrContainer::from_glib_full(pango_sys::pango_itemize(
from_glib_full_as_vec(pango_sys::pango_itemize(
context.to_glib_none().0, context.to_glib_none().0,
text.as_ptr() as *const i8, text.as_ptr() as *const i8,
start_index as i32, start_index as i32,
@ -33,6 +35,12 @@ pub fn pango_itemize(
} }
} }
unsafe fn from_glib_full_as_vec(ptr: *mut glib_ffi::GList) -> Vec<Item> {
let num = glib_ffi::g_list_length(ptr) as usize;
FromGlibContainer::from_glib_full_num(ptr, num)
}
pub fn pango_shape( pub fn pango_shape(
text: &str, text: &str,
offset: usize, offset: usize,