seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from pixers/fix-string_get-memory-leak

Browse Source 
Fix memory management in `string_get!`
This commit is contained in:
Nathan Fiedler
2018-03-29 20:11:32 -07:00
committed by GitHub
parent 2ba8a3d0d0 07dd10f9cb
commit 0366b9352d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wand/macros.rs
View File

@ -133,13 +133,14 @@ macro_rules! set_get_unchecked {
macro_rules! string_get { macro_rules! string_get {
($get:ident, $c_get:ident) => { ($get:ident, $c_get:ident) => {
pub fn $get(&self) -> Result<String, &'static str> { pub fn $get(&self) -> Result<String, &'static str> {
// TODO: memory management
let ptr = unsafe { ::bindings::$c_get(self.wand) }; let ptr = unsafe { ::bindings::$c_get(self.wand) };
if ptr.is_null() { if ptr.is_null() {
Err(concat!("null ptr returned by ", stringify!($get))) Err(concat!("null ptr returned by ", stringify!($get)))
} else { } else {
let c_str = unsafe { ::std::ffi::CStr::from_ptr(ptr) }; let c_str = unsafe { ::std::ffi::CStr::from_ptr(ptr) };
Ok(c_str.to_string_lossy().into_owned()) let result: String = c_str.to_string_lossy().into_owned();
unsafe { ::bindings::free(ptr as *mut ::libc::c_void) };
Ok(result)
} }
} }
} }