summaryrefslogtreecommitdiffstats
path: root/src/H5F.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/H5F.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/H5F.c')
-rw-r--r--src/H5F.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 5a8fd87..3c6df2b 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1164,8 +1164,7 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr,
- cur_size_ptr, cur_num_entries_ptr);
+ H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr);
/* Check args */
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE)))
@@ -1698,8 +1697,7 @@ H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2], unsigned hits[2
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE6("e", "i*Iu*Iu*Iu*Iu*Iu", file_id, accesses, hits, misses, evictions,
- bypasses);
+ H5TRACE6("e", "i*Iu*Iu*Iu*Iu*Iu", file_id, accesses, hits, misses, evictions, bypasses);
/* Check args */
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE)))