Skip to content

gio: DataInputStream::read_line_async() can return None slices #1803

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

gio: DataInputStream::read_line_async() can return None slices #1803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02308b
gio: `DataInputStream::read_line_async()` can return `None` slices
sdroege Aug 27, 2025
e7fc0d8
gio: Use correct finish function for `DataInputStream::read_line_utf8…
sdroege Aug 27, 2025
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
29 changes: 19 additions & 10 deletions gio/src/data_input_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
fn read_line<P: IsA<Cancellable>>(
&self,
cancellable: Option<&P>,
) -> Result<glib::collections::Slice<u8>, glib::Error> {
) -> Result<Option<glib::collections::Slice<u8>>, glib::Error> {
unsafe {
let mut length = mem::MaybeUninit::uninit();
let mut error = ptr::null_mut();
Expand All @@ -21,9 +21,13 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
cancellable.map(|p| p.as_ref()).to_glib_none().0,
&mut error,
);
let length = length.assume_init();
if error.is_null() {
Ok(FromGlibContainer::from_glib_full_num(ret, length))
if ret.is_null() {
Ok(None)
} else {
let length = length.assume_init();
Ok(Some(FromGlibContainer::from_glib_full_num(ret, length)))
}
} else {
Err(from_glib_full(error))
}
Expand All @@ -33,7 +37,7 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
#[doc(alias = "g_data_input_stream_read_line_async")]
fn read_line_async<
P: IsA<Cancellable>,
Q: FnOnce(Result<glib::collections::Slice<u8>, glib::Error>) + 'static,
Q: FnOnce(Result<Option<glib::collections::Slice<u8>>, glib::Error>) + 'static,
>(
&self,
io_priority: glib::Priority,
Expand All @@ -53,7 +57,7 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
Box_::new(glib::thread_guard::ThreadGuard::new(callback));
unsafe extern "C" fn read_line_async_trampoline<
Q: FnOnce(Result<glib::collections::Slice<u8>, glib::Error>) + 'static,
Q: FnOnce(Result<Option<glib::collections::Slice<u8>>, glib::Error>) + 'static,
>(
_source_object: *mut glib::gobject_ffi::GObject,
res: *mut ffi::GAsyncResult,
Expand All @@ -67,9 +71,13 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
length.as_mut_ptr(),
&mut error,
);
let length = length.assume_init();
let result = if error.is_null() {
Ok(FromGlibContainer::from_glib_full_num(ret, length))
if ret.is_null() {
Ok(None)
} else {
let length = length.assume_init();
Ok(Some(FromGlibContainer::from_glib_full_num(ret, length)))
}
} else {
Err(from_glib_full(error))
};
Expand All @@ -95,8 +103,9 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
io_priority: glib::Priority,
) -> Pin<
Box_<
dyn std::future::Future<Output = Result<glib::collections::Slice<u8>, glib::Error>>
+ 'static,
dyn std::future::Future<
Output = Result<Option<glib::collections::Slice<u8>>, glib::Error>,
> + 'static,
>,
> {
Box_::pin(crate::GioFuture::new(
Expand Down Expand Up @@ -159,7 +168,7 @@ pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
user_data: glib::ffi::gpointer,
) {
let mut error = ptr::null_mut();
let ret = ffi::g_data_input_stream_read_line_finish(
let ret = ffi::g_data_input_stream_read_line_finish_utf8(
_source_object as *mut _,
res,
ptr::null_mut(),
Expand Down
Loading