Skip to content

Remove undefined behavior from QMessageLogContext #1399

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

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

Remove undefined behavior from QMessageLogContext #1399

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
30 changes: 24 additions & 6 deletions crates/cxx-qt-lib/src/core/qtlogging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ mod ffi {

#[cxx_name = "qmessagelogcontext_file"]
#[doc(hidden)]
unsafe fn file(context: &QMessageLogContext) -> *const c_char;
fn file(context: &QMessageLogContext) -> *const c_char;

#[cxx_name = "qmessagelogcontext_function"]
#[doc(hidden)]
unsafe fn function(context: &QMessageLogContext) -> *const c_char;
fn function(context: &QMessageLogContext) -> *const c_char;

#[cxx_name = "qmessagelogcontext_category"]
#[doc(hidden)]
unsafe fn category(context: &QMessageLogContext) -> *const c_char;
fn category(context: &QMessageLogContext) -> *const c_char;
}

#[namespace = "rust::cxxqtlib1"]
Expand Down Expand Up @@ -133,17 +133,35 @@ impl<'a> QMessageLogContext<'a> {

/// The file path given to the message handler.
pub fn file(&self) -> &'a CStr {
unsafe { CStr::from_ptr(ffi::file(self)) }
let data = ffi::file(self);
if data.is_null() {
c""
} else {
// SAFETY: `data` is non-null and valid.
unsafe { CStr::from_ptr(data) }
}
}

/// The name of the function given to the message handler.
pub fn function(&self) -> &'a CStr {
unsafe { CStr::from_ptr(ffi::function(self)) }
let data = ffi::function(self);
if data.is_null() {
c""
} else {
// SAFETY: `data` is non-null and valid.
unsafe { CStr::from_ptr(data) }
}
}

/// The category given to the message handler.
pub fn category(&self) -> &'a CStr {
unsafe { CStr::from_ptr(ffi::category(self)) }
let data = ffi::category(self);
if data.is_null() {
c""
} else {
// SAFETY: `data` is non-null and valid.
unsafe { CStr::from_ptr(data) }
}
}
}

Expand Down
Loading