Skip to content

Avoid unsafe intermediate slice construction in varlena functions #2368

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
SergeiPatiakin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Avoid unsafe intermediate slice construction in varlena functions #2368

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
14 changes: 7 additions & 7 deletions pgrx/src/varlena.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ pub unsafe fn varsize_any_exhdr(ptr: *const pg_sys::varlena) -> usize {
#[inline]
pub unsafe fn vardata_1b(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_char {
let va1b = ptr as *const pg_sys::varattrib_1b;
(*va1b).va_data.as_slice(varsize_1b(ptr)).as_ptr() as *const std::os::raw::c_char
(*va1b).va_data.as_ptr()
}

/// ```c
Expand All @@ -376,8 +376,8 @@ pub unsafe fn vardata_1b(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_
#[allow(clippy::cast_ptr_alignment)]
#[inline]
pub unsafe fn vardata_4b(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_char {
let va1b = ptr as *const pg_sys::varattrib_4b__bindgen_ty_1; // 4byte
(*va1b).va_data.as_slice(varsize_1b(ptr)).as_ptr() as *const std::os::raw::c_char
let va4b = ptr as *const pg_sys::varattrib_4b__bindgen_ty_1; // 4byte
(*va4b).va_data.as_ptr()
}

/// ```c
Expand All @@ -386,8 +386,8 @@ pub unsafe fn vardata_4b(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_
#[allow(clippy::cast_ptr_alignment)]
#[inline]
pub unsafe fn vardata_4b_c(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_char {
let va1b = ptr as *const pg_sys::varattrib_4b__bindgen_ty_2; // compressed
(*va1b).va_data.as_slice(varsize_1b(ptr)).as_ptr() as *const std::os::raw::c_char
let va4bc = ptr as *const pg_sys::varattrib_4b__bindgen_ty_2; // compressed
(*va4bc).va_data.as_ptr()
}

/// ```c
Expand All @@ -396,8 +396,8 @@ pub unsafe fn vardata_4b_c(ptr: *const pg_sys::varlena) -> *const std::os::raw::
#[allow(clippy::cast_ptr_alignment)]
#[inline]
pub unsafe fn vardata_1b_e(ptr: *const pg_sys::varlena) -> *const std::os::raw::c_char {
let va1b = ptr as *const pg_sys::varattrib_1b_e;
(*va1b).va_data.as_slice(varsize_1b(ptr)).as_ptr() as *const std::os::raw::c_char
let va1be = ptr as *const pg_sys::varattrib_1b_e;
(*va1be).va_data.as_ptr()
}

/// ```c
Expand Down
Loading