luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2687 from saethlin/main 

Avoid calling slice::from_raw_parts with a null pointer
This commit is contained in:
David Hewitt 2022-10-20 07:34:39 +01:00 committed by GitHub
parent 446c0e82f0 7ff5ab770a
commit 39a68cf7ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newsfragments/2687.fixed.md Normal file
View File

@ -0,0 +1 @@
Fix UB in `FunctionDescription::extract_arguments_fastcall` due to creating slices from a null pointer.

8
src/impl_/extract_argument.rs
View File

@ -221,7 +221,7 @@ impl FunctionDescription {
/// Equivalent of `extract_arguments_tuple_dict` which uses the Python C-API "fastcall" convention.
///
/// # Safety
/// - `args` must be a pointer to a C-style array of valid `ffi::PyObject` pointers.
/// - `args` must be a pointer to a C-style array of valid `ffi::PyObject` pointers, or NULL.
/// - `kwnames` must be a pointer to a PyTuple, or NULL.
/// - `nargs + kwnames.len()` is the total length of the `args` array.
#[cfg(not(Py_LIMITED_API))]
@ -240,7 +240,11 @@ impl FunctionDescription {
// Safety: Option<&PyAny> has the same memory layout as `*mut ffi::PyObject`
let args = args as *const Option<&PyAny>;
let positional_args_provided = nargs as usize;
let args_slice = std::slice::from_raw_parts(args, positional_args_provided);
let args_slice = if args.is_null() {
&[]
} else {
std::slice::from_raw_parts(args, positional_args_provided)
};
let num_positional_parameters = self.positional_parameter_names.len();