diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2021-10-25 14:27:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 14:27:59 (GMT) |
| commit | bc5825e49120703003533bcd74e28c50c4fde983 (patch) | |
| tree | 486f521b3d584c4590b245d37cf5f48455e41993 /src | |
| parent | 9d296c30e57105eedd3fd747c32d4ec1c9c2494d (diff) | |
| download | hdf5-bc5825e49120703003533bcd74e28c50c4fde983.zip hdf5-bc5825e49120703003533bcd74e28c50c4fde983.tar.gz hdf5-bc5825e49120703003533bcd74e28c50c4fde983.tar.bz2 | |
1 10 merge hdffv 10590 (#1128)
* Merge pull request #60 from bmribler/develop
Fix HDFFV-10590
* H5repack tests should fail if a corrupted file causes h5repack to
segfault/core dump.
* Remove test file, duplicate of h5repack_CVE-2018-17432.h5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Osdspace.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 6a2557f..8e28c85 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -139,8 +139,11 @@ H5O__sdspace_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UN flags = *p++; /* Get or determine the type of the extent */ - if (version >= H5O_SDSPACE_VERSION_2) + if (version >= H5O_SDSPACE_VERSION_2) { sdim->type = (H5S_class_t)*p++; + if (sdim->type != H5S_SIMPLE && sdim->rank > 0) + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid rank for scalar or NULL dataspace") + } /* end if */ else { /* Set the dataspace type to be simple or scalar as appropriate */ if (sdim->rank > 0) @@ -274,13 +277,15 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg) *p++ = 0; /*reserved*/ } /* end else */ - /* Current & maximum dimensions */ - if (sdim->rank > 0) { - for (u = 0; u < sdim->rank; u++) - H5F_ENCODE_LENGTH(f, p, sdim->size[u]); - if (flags & H5S_VALID_MAX) { + /* Encode dataspace dimensions for simple dataspaces */ + if (H5S_SIMPLE == sdim->type) { + /* Encode current & maximum dimensions */ + if (sdim->rank > 0) { for (u = 0; u < sdim->rank; u++) - H5F_ENCODE_LENGTH(f, p, sdim->max[u]); + H5F_ENCODE_LENGTH(f, p, sdim->size[u]); + if (flags & H5S_VALID_MAX) + for (u = 0; u < sdim->rank; u++) + H5F_ENCODE_LENGTH(f, p, sdim->max[u]); } /* end if */ } /* end if */ |