diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-07-08 20:04:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 20:04:23 (GMT) |
| commit | aa688c68c447c5739281f3733f31d891bcc934d0 (patch) | |
| tree | 1d8f5571ff5ae13169166107aa449fef4b5f8629 | |
| parent | a45ade88863e7e413ec408cdc62d60a1c1bc76a2 (diff) | |
| download | hdf5-aa688c68c447c5739281f3733f31d891bcc934d0.zip hdf5-aa688c68c447c5739281f3733f31d891bcc934d0.tar.gz hdf5-aa688c68c447c5739281f3733f31d891bcc934d0.tar.bz2 | |
Convert assertion on (possibly corrupt) file contents to normal error check (#1861)
* Convert assertion on (possibly corrupt) file contents to normal error check
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
| -rw-r--r-- | release_docs/RELEASE.txt | 11 | ||||
| -rw-r--r-- | src/H5Fsuper.c | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 69d9780..d5a860e 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -126,7 +126,16 @@ Bug Fixes since HDF5-1.13.1 release =================================== Library ------- - - + - Converted an assertion on (possibly corrupt) file contents to a normal + error check + + Previously, the library contained an assertion check that a read superblock + doesn't contain a superblock extension message when the superblock + version < 2. When a corrupt HDF5 file is read, this assertion can be triggered + in debug builds of HDF5. In production builds, this situation could cause + either a library error or a crash, depending on the platform. + + (JTH - 2022/07/08) Java Library diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 4e4fe8d..6a82a6e 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -687,7 +687,9 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read) /* Sanity check - superblock extension should only be defined for * superblock version >= 2. */ - HDassert(sblock->super_vers >= HDF5_SUPERBLOCK_VERSION_2); + if (sblock->super_vers < HDF5_SUPERBLOCK_VERSION_2) + HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, + "invalid superblock - extension message should not be defined for version < 2") /* Check for superblock extension being located "outside" the stored * 'eoa' value, which can occur with the split/multi VFD. |