Skip to content

Add data length validation for write_section and write_region #436

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
simonrw wants to merge 1 commit into
base: fix/axis-ordering-region
Choose a base branch
from
Open

Add data length validation for write_section and write_region #436

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
18 changes: 17 additions & 1 deletion fitsio/src/images.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,13 @@ macro_rules! write_image_impl {
match hdu.info {
HduInfo::ImageInfo { .. } => {
let nelements = range.end - range.start;
assert!(data.len() >= nelements);
if data.len() < nelements {
return Err(format!(
"data length ({}) is less than the number of elements to write ({})",
data.len(),
nelements
).as_str().into());
}
let mut status = 0;
unsafe {
fits_write_img(
Expand Down Expand Up @@ -256,6 +262,7 @@ macro_rules! write_image_impl {
let mut fpixel = Vec::with_capacity(n_ranges);
let mut lpixel = Vec::with_capacity(n_ranges);

let mut nelements = 1usize;
// Reverse the ranges to match CFITSIO's Fortran column-major
// convention, since the user provides ranges in C row-major order
for range in ranges.iter().rev() {
Expand All @@ -264,6 +271,15 @@ macro_rules! write_image_impl {
let end = range.end;
fpixel.push(start as _);
lpixel.push(end as _);
nelements *= (end + 1) - start;
}

if data.len() < nelements {
return Err(format!(
"data length ({}) is less than the number of elements in the region ({})",
data.len(),
nelements
).as_str().into());
}

let mut status = 0;
Expand Down
Loading