Skip to content

fix: SetPart 范围校验与 reserved 硬错（配合 kvlang body 直写收紧） #46

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
miaobyte merged 1 commit into from
Nov 1, 2026
Merged

fix: SetPart 范围校验与 reserved 硬错（配合 kvlang body 直写收紧） #46

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: 34 additions & 2 deletions src/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,24 @@ pub extern "C" fn kvspaceSetPart(
return 1;
}
let key = unsafe { cstr(key) }.to_string();
if crate::r#const::is_reserved(&key) {
write_err(err, err_cap, "kvspace: set-part on reserved key");
return 1;
}
/* 原地写只允许改 body [8, 8+len)：读 8 字节 head 取 len，越界一律硬错，
* head/attr 不可写。 */
let head8 = hd.kv.get_part(&key, 0, crate::headlenpow::PREFIX as u32);
let Some(body_len) = crate::headlenpow::read_len(&head8) else {
write_err(err, err_cap, "kvspace: set-part on missing key");
return 1;
};
let prefix = crate::headlenpow::PREFIX as u64;
if (offset as u64) < prefix
|| (offset as u64 - prefix) + (buf_len as u64) > body_len
{
write_err(err, err_cap, "kvspace: set-part outside body");
return 1;
}
let data = unsafe { std::slice::from_raw_parts(buf, buf_len as usize) };
let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
hd.kv.set_part(&key, offset, data)
Expand Down Expand Up @@ -614,7 +632,14 @@ pub extern "C" fn kvspaceWriteInPlace(
hd.read_cache.remove(&key);
hd.write_buf = existing;
hd.pending_key = Some(key);
unsafe { *body = hd.write_buf.as_mut_ptr().add(head_len) };
/* body 指针供调用方直接写 8 字节标量：对齐是前条件，不是假设。 */
let body_ptr = unsafe { hd.write_buf.as_mut_ptr().add(head_len) };
debug_assert_eq!(
body_ptr as usize % 8,
0,
"kvspace: write-in-place body pointer is not 8-byte aligned"
);
unsafe { *body = body_ptr };
0
}

Expand Down Expand Up @@ -656,7 +681,14 @@ pub extern "C" fn kvspaceWriteNewPlace(
hd.read_cache.remove(&key);
hd.write_buf = xv;
hd.pending_key = Some(key);
unsafe { *body = hd.write_buf.as_mut_ptr().add(head_len) };
/* body 指针供调用方直接写 8 字节标量：对齐是前条件，不是假设。 */
let body_ptr = unsafe { hd.write_buf.as_mut_ptr().add(head_len) };
debug_assert_eq!(
body_ptr as usize % 8,
0,
"kvspace: write-new-place body pointer is not 8-byte aligned"
);
unsafe { *body = body_ptr };
0
}

Expand Down
Loading