Skip to content

x_read should fill remaining bytes with 0 as per contract #84

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
carlsverre merged 2 commits into from
May 16, 2026
Merged

x_read should fill remaining bytes with 0 as per contract #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
546564f
fix: xread fills remaining bytes with 0 as per contract
m-vze May 7, 2026
7b5089a
Merge branch 'main' into fix-xread-short-read
carlsverre May 16, 2026
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
9 changes: 8 additions & 1 deletion src/vfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,14 @@ unsafe extern "C" fn x_read<T: Vfs>(
let buf_len: usize = i_amt.try_into().map_err(|_| vars::SQLITE_IOERR_READ)?;
let offset: usize = i_ofst.try_into().map_err(|_| vars::SQLITE_IOERR_READ)?;
let buf = unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), buf_len) };
vfs.read(&mut file.handle, offset, buf)?;
let bytes_read = vfs.read(&mut file.handle, offset, buf)?;
if bytes_read < buf_len {
// From https://sqlite.org/c3ref/io_methods.html:
// "If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill in the unread portions
// of the buffer with zeros."
buf[bytes_read..].fill(0);
return Err(vars::SQLITE_IOERR_SHORT_READ);
}
Ok(vars::SQLITE_OK)
})
}
Expand Down
Loading