Merge branch 'develop' into zzz-gitlab-ci

8 files changed, 61 insertions, 21 deletions

diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 91d3ea9..a664e6f 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -405,7 +405,7 @@
   # --------------------------------------------------------------------
   HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
 
-  if (WIN32 OR MINGW)
+  if (WIN32)
     configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
     #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
     #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index af73b75..81d619c 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.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 h5repack_HDFFV-10590_CVE-2018-17432_out.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 a95a22e..3764081 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -128,6 +128,8 @@ $SRC_H5REPACK_TESTFILES/h5repack_paged_nopersist.h5
 $SRC_H5REPACK_TESTFILES/h5repack_paged_persist.h5
 ########h5diff/testfile########
 $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
+########test#HDFFV-10590########
+$SRC_H5REPACK_TESTFILES/h5repack_HDFFV-10590_CVE-2018-17432.h5
 ########tools/testfiles#for#external#links########
 $SRC_TOOLS_TESTFILES/tsoftlinks.h5
 $SRC_TOOLS_TESTFILES/textlinkfar.h5
@@ -865,6 +867,34 @@ TOOLTESTV()
    rm -f $outfile
 }
 
+# Same as TOOLTEST, but expects h5repack fails
+#
+TOOLTEST_FAIL()
+{
+    infile=$1
+    outfile=$2
+    expect="$TESTDIR/$2-$1.ddl"
+    actual="$TESTDIR/$2-$1.out"
+    actual_err="$TESTDIR/$2-$1.err"
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    ) >$actual
+    RET=$?
+    if [ $RET == 0 ] ; then
+        nerrors="`expr $nerrors + 1`"
+        echo " FAILED"
+    else
+        echo " PASSED"
+    fi
+    rm -f $outfile
+}
+
 # This is same as TOOLTESTV() with comparing display output
 # with actual filename swapped
 #
@@ -1681,6 +1711,10 @@ TOOLTEST HDFFV-5932 h5repack_attr_refs.h5
 # Note: this test is experimental for sharing test file among tools
 TOOLTEST HDFFV-7840 h5diff_attr1.h5
 
+# test HDFFV-10590
+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
 TOOLTEST_META meta_short h5repack_layout.h5 -M 8192
 TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192
diff --git a/tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5 b/tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5
new file mode 100644
index 0000000..7a815ba
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_HDFFV-10590_CVE-2018-17432.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 9e83ff8..6f586cc 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -1,7 +1,7 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
-    minor: Unable to initialize object
+    minor: Unable to create file
   #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
     major: Virtual Object Layer
     minor: Unable to create file
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index 22aca04..df4c569 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -465,7 +465,7 @@ parse_args(int argc, char **argv)
  * End:
  */
 
-#else  /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
 /* dummy program since H5_HAVE_PARALLEL is not configured in */
 int
 main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv)
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index d64f421..2f812d7 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -224,14 +224,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
 #define HDisalnum(C)     isalnum((int)(C)) /*cast for solaris warning*/
 #define HDisalpha(C)     isalpha((int)(C)) /*cast for solaris warning*/
 #define HDisatty(F)      isatty(F)
-#define HDiscntrl(C)     iscntrl((int)(C))  /*cast for solaris warning*/
-#define HDisdigit(C)     isdigit((int)(C))  /*cast for solaris warning*/
-#define HDisgraph(C)     isgraph((int)(C))  /*cast for solaris warning*/
-#define HDislower(C)     islower((int)(C))  /*cast for solaris warning*/
-#define HDisprint(C)     isprint((int)(C))  /*cast for solaris warning*/
-#define HDispunct(C)     ispunct((int)(C))  /*cast for solaris warning*/
-#define HDisspace(C)     isspace((int)(C))  /*cast for solaris warning*/
-#define HDisupper(C)     isupper((int)(C))  /*cast for solaris warning*/
+#define HDiscntrl(C)     iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C)     isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C)     isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C)     islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C)     isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C)     ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C)     isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C)     isupper((int)(C)) /*cast for solaris warning*/
 #define HDisxdigit(C)    isxdigit((int)(C)) /*cast for solaris warning*/
 #define HDkill(P, S)     kill(P, S)
 #define HDlabs(X)        labs(X)
@@ -458,7 +458,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 #else /* H5_HAVE_WIN32_API */
 
 #if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *         strdup(const char *s);
+extern char *strdup(const char *s);
 #endif
 
 #define HDstrdup(S) strdup(S)
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 4001257..c0e0793 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -239,14 +239,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
 #define HDisalnum(C)     isalnum((int)(C)) /*cast for solaris warning*/
 #define HDisalpha(C)     isalpha((int)(C)) /*cast for solaris warning*/
 #define HDisatty(F)      isatty(F)
-#define HDiscntrl(C)     iscntrl((int)(C))  /*cast for solaris warning*/
-#define HDisdigit(C)     isdigit((int)(C))  /*cast for solaris warning*/
-#define HDisgraph(C)     isgraph((int)(C))  /*cast for solaris warning*/
-#define HDislower(C)     islower((int)(C))  /*cast for solaris warning*/
-#define HDisprint(C)     isprint((int)(C))  /*cast for solaris warning*/
-#define HDispunct(C)     ispunct((int)(C))  /*cast for solaris warning*/
-#define HDisspace(C)     isspace((int)(C))  /*cast for solaris warning*/
-#define HDisupper(C)     isupper((int)(C))  /*cast for solaris warning*/
+#define HDiscntrl(C)     iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C)     isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C)     isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C)     islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C)     isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C)     ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C)     isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C)     isupper((int)(C)) /*cast for solaris warning*/
 #define HDisxdigit(C)    isxdigit((int)(C)) /*cast for solaris warning*/
 #define HDkill(P, S)     kill(P, S)
 #define HDlabs(X)        labs(X)
@@ -473,7 +473,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 #else /* H5_HAVE_WIN32_API */
 
 #if !defined strdup && !defined H5_HAVE_STRDUP
-extern char *         strdup(const char *s);
+extern char *strdup(const char *s);
 #endif
 
 #define HDstrdup(S) strdup(S)