Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix memory leaks #70

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix memory leaks #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,11 @@ impl Metadata {
let metadata = gexiv2::gexiv2_metadata_new();
let ok = gexiv2::gexiv2_metadata_open_path(metadata, c_str_path.as_ptr(), &mut err);
if ok != 1 {
let err_msg = ffi::CStr::from_ptr((*err).message).to_str();
gexiv2::gexiv2_metadata_free(metadata);
let err_msg = ffi::CStr::from_ptr((*err).message).to_str().map(str::to_string);
// gexiv2::g_error_free(err);
return Err(Rexiv2Error::Internal(
err_msg.ok().map(|msg| msg.to_string()),
err_msg.ok(),
));
}
Ok(Metadata { raw: metadata })
Expand All @@ -314,9 +316,11 @@ impl Metadata {
&mut err,
);
if ok != 1 {
let err_msg = ffi::CStr::from_ptr((*err).message).to_str();
gexiv2::gexiv2_metadata_free(metadata);
let err_msg = ffi::CStr::from_ptr((*err).message).to_str().map(str::to_string);
// gexiv2::g_error_free(err);
return Err(Rexiv2Error::Internal(
err_msg.ok().map(|msg| msg.to_string()),
err_msg.ok(),
));
}
Ok(Metadata { raw: metadata })
Expand Down Expand Up @@ -346,9 +350,11 @@ impl Metadata {
&mut err,
);
if ok != 1 {
let err_msg = ffi::CStr::from_ptr((*err).message).to_str();
gexiv2::gexiv2_metadata_free(metadata);
let err_msg = ffi::CStr::from_ptr((*err).message).to_str().map(str::to_string);
// gexiv2::g_error_free(err);
return Err(Rexiv2Error::Internal(
err_msg.ok().map(|msg| msg.to_string()),
err_msg.ok(),
));
}
Ok(Metadata { raw: metadata })
Expand All @@ -363,9 +369,10 @@ impl Metadata {
unsafe {
let ok = gexiv2::gexiv2_metadata_save_file(self.raw, c_str_path.as_ptr(), &mut err);
if ok != 1 {
let err_msg = ffi::CStr::from_ptr((*err).message).to_str();
let err_msg = ffi::CStr::from_ptr((*err).message).to_str().map(str::to_string);
// gexiv2::g_error_free(err);
return Err(Rexiv2Error::Internal(
err_msg.ok().map(|msg| msg.to_string()),
err_msg.ok(),
));
}
Ok(())
Expand Down Expand Up @@ -729,9 +736,9 @@ impl Metadata {
if c_str_val.is_null() {
return Err(Rexiv2Error::NoValue);
}
let value = ffi::CStr::from_ptr(c_str_val).to_str()?.to_string();
let value = ffi::CStr::from_ptr(c_str_val).to_str().map(str::to_string);
libc::free(c_str_val as *mut libc::c_void);
Ok(value)
Ok(value?)
}
}

Expand Down Expand Up @@ -772,9 +779,9 @@ impl Metadata {
if c_str_val.is_null() {
return Err(Rexiv2Error::NoValue);
}
let value = ffi::CStr::from_ptr(c_str_val).to_str()?.to_string();
let value = ffi::CStr::from_ptr(c_str_val).to_str().map(str::to_string);
libc::free(c_str_val as *mut libc::c_void);
Ok(value)
Ok(value?)
}
}

Expand Down Expand Up @@ -1085,9 +1092,10 @@ impl Metadata {
&mut err,
);
if ok != 1 {
let err_msg = ffi::CStr::from_ptr((*err).message).to_str();
let err_msg = ffi::CStr::from_ptr((*err).message).to_str().map(str::to_string);
// gexiv2::g_error_free(err);
return Err(Rexiv2Error::Internal(
err_msg.ok().map(|msg| msg.to_string()),
err_msg.ok(),
));
}
Ok(())
Expand Down