mx/durin
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add range checks on frame retrieval

Browse Source
This commit is contained in:
Charles Mita
2018-03-28 13:38:40 +01:00
parent dc41a80525
commit dc94ad89ca
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file.c
+11
View File
@@ -187,6 +187,11 @@ int get_nxs_frame(
int retval = 0;
hsize_t frame_idx[3] = {n, 0, 0};
hsize_t frame_size[3] = {1, ds_prop->dims[1], ds_prop->dims[2]};
if (n < 0 || n >= ds_prop->dims[0]) {
char message[64];
sprintf(message, "Selected frame %d is out of range valid range [0, %d]", n, (int) ds_prop->dims[0] - 1);
ERROR_JUMP(-1, done, message);
}
retval = get_frame(desc->data_group_id, "data", frame_idx, frame_size, data_width, buffer);
if (retval < 0) {
ERROR_JUMP(retval, done, "");
@@ -210,6 +215,12 @@ int get_dectris_eiger_frame(
hsize_t frame_idx[3] = {0, 0, 0};
hsize_t frame_size[3] = {1, ds_prop->dims[1], ds_prop->dims[2]};
if (n < 0 || n >= ds_prop->dims[0]) {
char message[64];
sprintf(message, "Selected frame %d is out of range valid range [0, %d]", n, (int) ds_prop->dims[0] - 1);
ERROR_JUMP(-1, done, message);
}
/* determine the relevant data block */
frame_count = 0;
block = 0;