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

HDF5Objects: Safer string handling in ReadString()

Browse Source
This commit is contained in:
leonarski_f
2026-04-16 08:32:12 +02:00
parent be09b62f8f
commit c16523db21
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
writer/HDF5Objects.cpp
+13 -7
View File
@@ -779,18 +779,24 @@ std::string HDF5DataSet::ReadString() const {
HDF5DataSpace file_space(*this);
if (file_space.GetNumOfDimensions() != 0)
throw JFJochException(JFJochExceptionCategory::HDF5, "Dataset tries to read string (scalar) from vector dataset");
HDF5DataType file_data_type(*this);
if (file_data_type.GetElemSize() <= 0)
HDF5DataType file_data_type(*this);
const size_t size = file_data_type.GetElemSize();
if (size == 0)
return "";
char tmp[file_data_type.GetElemSize()+1];
tmp[file_data_type.GetElemSize()] = 0;
std::string buffer(size, '\0');
if (H5Dread(id, file_data_type.GetID(), H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0)
throw JFJochException(JFJochExceptionCategory::HDF5, dataset_name + ": read unsuccessful");
if (H5Dread(id, file_data_type.GetID(), H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer.data()) < 0)
throw JFJochException(JFJochExceptionCategory::HDF5,
dataset_name + ": read unsuccessful");
return {tmp};
const size_t end = buffer.find('\0');
if (end != std::string::npos)
buffer.resize(end);
return buffer;
}
HDF5DataSet::~HDF5DataSet() {