hasufell/rust-libnotify
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix body/icon pointing to garbage

Browse Source 
The pattern matching moves 'body' and drops it after
creation of the pointer. We must avoid the move, by using 'ref'.
This commit is contained in:
Julian Ospald 2017-07-09 12:51:55 +02:00
parent 5ab8f64e88
commit 7d80600657
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib.rs
View File

@ -130,7 +130,7 @@ impl Context {
None => None, None => None,
}; };
let body_ptr = match body { let body_ptr = match body {
Some(body) => body.as_ptr(), Some(ref body) => body.as_ptr(),
None => std::ptr::null(), None => std::ptr::null(),
}; };
let icon = match icon { let icon = match icon {
@ -138,9 +138,10 @@ impl Context {
None => None, None => None,
}; };
let icon_ptr = match icon { let icon_ptr = match icon {
Some(icon) => icon.as_ptr(), Some(ref icon) => icon.as_ptr(),
None => std::ptr::null(), None => std::ptr::null(),
}; };
unsafe { unsafe {
let n = sys::notify_notification_new(summary.as_ptr(), body_ptr, icon_ptr); let n = sys::notify_notification_new(summary.as_ptr(), body_ptr, icon_ptr);
if n.is_null() { if n.is_null() {