diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2020-11-11 20:42:11 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2020-11-11 20:42:11 (GMT) |
| commit | 7ade95c57293b7f586d8bb41a4599ca5709bd456 (patch) | |
| tree | 97c3b4f425790d36bc5454e19014e2eb6f41d14b | |
| parent | e5f792cf12cd246fbf7d9f54e6675738d7c5ccd5 (diff) | |
| download | hdf5-7ade95c57293b7f586d8bb41a4599ca5709bd456.zip hdf5-7ade95c57293b7f586d8bb41a4599ca5709bd456.tar.gz hdf5-7ade95c57293b7f586d8bb41a4599ca5709bd456.tar.bz2 | |
Miscellaneous update
- added test for CMake
- renamed new input file to conform to the existing files
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | tools/test/h5repack/CMakeTests.cmake | 6 | ||||
| -rw-r--r-- | tools/test/h5repack/h5repack.sh.in | 2 | ||||
| -rw-r--r-- | tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5 (renamed from tools/test/h5repack/testfiles/HDFFV-10590_CVE-2018-17432.h5) | bin | 7648 -> 7648 bytes |
4 files changed, 8 insertions, 1 deletions
@@ -2736,6 +2736,7 @@ ./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl ./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl ./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl +./tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5 ./tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl ./tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl ./tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake index af73b75..7bc267c 100644 --- a/tools/test/h5repack/CMakeTests.cmake +++ b/tools/test/h5repack/CMakeTests.cmake @@ -51,6 +51,7 @@ ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5 ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5 ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5 + ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_HDFFV-10590_CVE-2018-17432_out.h5 ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5 ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5 ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5 @@ -1549,6 +1550,11 @@ # Note: this test is experimental for sharing test file among tools ADD_H5_TEST (HDFFV-7840 "TEST" h5diff_attr1.h5) +# test CVE-2018-17432 fix + set (arg h5repack_HDFFV-10590_CVE-2018-17432.h5 --low=1 --high=2 -f GZIP=8 -l dset1:CHUNK=5x6) + set (TESTTYPE "TEST") + ADD_H5_FILTER_TEST (HDFFV-10590 "" ${TESTTYPE} 1 ${arg}) + # tests for metadata block size option ('-M') ADD_H5_TEST_META (meta_short h5repack_layout.h5 -M 8192) ADD_H5_TEST_META (meta_long h5repack_layout.h5 --metadata_block_size=8192) diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index a3676af..3d0f399 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -1710,7 +1710,7 @@ TOOLTEST HDFFV-5932 h5repack_attr_refs.h5 TOOLTEST HDFFV-7840 h5diff_attr1.h5 # test HDFFV-10590 -arg="HDFFV-10590_CVE-2018-17432.h5 HDFFV-10590_CVE-2018-17432_out.h5 --low=1 --high=2 -f GZIP=8 -l dset1:CHUNK=5x6" +arg="h5repack_HDFFV-10590_CVE-2018-17432.h5 h5repack_HDFFV-10590_CVE-2018-17432_out.h5 --low=1 --high=2 -f GZIP=8 -l dset1:CHUNK=5x6" TOOLTEST_FAIL $arg # tests for metadata block size option diff --git a/tools/test/h5repack/testfiles/HDFFV-10590_CVE-2018-17432.h5 b/tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5 Binary files differindex 7a815ba..7a815ba 100644 --- a/tools/test/h5repack/testfiles/HDFFV-10590_CVE-2018-17432.h5 +++ b/tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5 |