Skip to content

Fix OOB read / segfault when reading SHAPE-scalar HDF5 datasets #63

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

Closed
SimonPinches wants to merge 1 commit into from
Closed

Fix OOB read / segfault when reading SHAPE-scalar HDF5 datasets #63

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: 28 additions & 8 deletions src/hdf5/hdf5_dataset_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,11 +1085,21 @@ void HDF5DataSetHandler::readIntNDFromBuffer(HDF5HsSelectionReader & hsSelection
*data = (void*) malloc(shape*sizeof(int));
if (rank != dim) {
HDF5Utils hdf5_utils;
std::vector < int > indices = current_arrctx_indices;
indices.push_back(0);
int index = hdf5_utils.indices_to_flat_index(indices, hsSelectionReader.getDataSpaceDims());
int index;
if (dim != 0) {
std::vector < int > indices = current_arrctx_indices;
indices.push_back(0);
index = hdf5_utils.indices_to_flat_index(indices, hsSelectionReader.getDataSpaceDims());
}
else {
// SHAPE-like datasets store one scalar per AOS cell: the index list
// already matches the dataset rank, so appending the trailing
// value-dimension index over-extends it and reads out of bounds.
// Mirrors the guard in fillFullBuffers().
index = hdf5_utils.indices_to_flat_index(current_arrctx_indices, hsSelectionReader.getDataSpaceDims());
}
memcpy(*data, v+index, shape*sizeof(int));

}
else {
memcpy(*data, v, shape*sizeof(int));
Expand All @@ -1108,11 +1118,21 @@ void HDF5DataSetHandler::readDoubleNDFromBuffer(HDF5HsSelectionReader & hsSelect
*data = (void*) malloc(shape*sizeof(double));
if (rank != dim) {
HDF5Utils hdf5_utils;
std::vector < int > indices = current_arrctx_indices;
indices.push_back(0);
int index = hdf5_utils.indices_to_flat_index(indices, hsSelectionReader.getDataSpaceDims());
int index;
if (dim != 0) {
std::vector < int > indices = current_arrctx_indices;
indices.push_back(0);
index = hdf5_utils.indices_to_flat_index(indices, hsSelectionReader.getDataSpaceDims());
}
else {
// SHAPE-like datasets store one scalar per AOS cell: the index list
// already matches the dataset rank, so appending the trailing
// value-dimension index over-extends it and reads out of bounds.
// Mirrors the guard in fillFullBuffers().
index = hdf5_utils.indices_to_flat_index(current_arrctx_indices, hsSelectionReader.getDataSpaceDims());
}
memcpy(*data, v+index, shape*sizeof(double));
}
}
else {
memcpy(*data, v, shape*sizeof(double));
}
Expand Down
Loading