summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2020-10-26 18:04:35 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2020-10-26 18:04:35 (GMT)
commit273c0c18368e5e54d61467e9e5b70e6fd87981c5 (patch)
treec833ab2f1b28d4a8ad0b5687390201fc6c013abc /src/H5D.c
parenta4269a08b91e794c1de4058348e076be9fef657e (diff)
downloadhdf5-273c0c18368e5e54d61467e9e5b70e6fd87981c5.zip
hdf5-273c0c18368e5e54d61467e9e5b70e6fd87981c5.tar.gz
hdf5-273c0c18368e5e54d61467e9e5b70e6fd87981c5.tar.bz2
Fix HDFFV-10590
Description This is to fix the CVE issue CVE-2018-17432. h5repack produced a segfault on a corrupted file. This fix modified the dataspace encode and decode functions per Quincey's suggestion to prevent the segfault and h5repack only failed for the corrupted file now. Platforms tested: Linux/64 (jelly)
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5D.c b/src/H5D.c
index f342499..b8b6f65 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -96,8 +96,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_API(H5I_INVALID_HID)
- H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id,
- dapl_id);
+ H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id);
/* Check arguments */
if (!name)
@@ -1052,8 +1051,7 @@ H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t chk_index, hsize_t *of
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE7("e", "iih*h*Iu*a*h", dset_id, fspace_id, chk_index, offset,
- filter_mask, addr, size);
+ H5TRACE7("e", "iih*h*Iu*a*h", dset_id, fspace_id, chk_index, offset, filter_mask, addr, size);
/* Check arguments */
if (NULL == offset && NULL == filter_mask && NULL == addr && NULL == size)