Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '593e4038b3ab474a47e468bb3478d4ae3a6820e6':
  Fix for daily test failure Fix for the compilation error from the PGI compiler.
  Modifications based on comments from pull request review (1) Remove unnecessary asserts (2) Add code to insert bad offset values to the test file in gen_bad_offset.c
  HDFFV-10188 force non-native type description
  HDFFV-10188 emu insists on printing non-native description
  Fix for HDFFV-10216 segfault in H5G_node_cmp3 with corrupt h5 file Fix H5HL_offset_into() to return error when offset exceeds heap data block size. Also fix other places that call this routine to detect error return.
  HDFFV-10188 fix typo
  HDFFV-10188 add missing copy commands
  HDFFV-10188 Add tests and files
  HDFFV-10188 enable null space test
  HDFFV-10188 add release note
  HDFFV-10188 - Check for empty string first
  HDFFV-10188 error on NULL dataspace

5 files changed, 205 insertions, 1 deletions

diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 5f0d386..5d2f30b 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -183,6 +183,7 @@ endforeach ()
 set (HDF5_REFERENCE_TEST_FILES
     aggr.h5
     bad_compound.h5
+    bad_offset.h5
     be_data.h5
     be_extlink1.h5
     be_extlink2.h5
@@ -1336,6 +1337,7 @@ if (HDF5_BUILD_GENERATORS)
 
   # generator executables
   set (H5_GENERATORS
+      gen_bad_offset
       gen_bad_ohdr
       gen_bogus
       gen_cross
diff --git a/test/Makefile.am b/test/Makefile.am
index f64b6d8..53dbf0d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -94,7 +94,7 @@ endif
 BUILD_ALL_PROGS=gen_bad_ohdr gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
     gen_new_fill gen_new_group gen_new_mtime gen_new_super gen_noencoder \
     gen_nullspace gen_udlinks space_overflow gen_filespace gen_specmetaread \
-    gen_sizes_lheap gen_file_image gen_plist
+    gen_sizes_lheap gen_file_image gen_plist gen_bad_offset
 
 if BUILD_ALL_CONDITIONAL
   noinst_PROGRAMS=$(BUILD_ALL_PROGS)
diff --git a/test/bad_offset.h5 b/test/bad_offset.h5
new file mode 100644
index 0000000..231dca2
--- /dev/null
+++ b/test/bad_offset.h5
diff --git a/test/gen_bad_offset.c b/test/gen_bad_offset.c
new file mode 100644
index 0000000..82e94cd
--- /dev/null
+++ b/test/gen_bad_offset.c
@@ -0,0 +1,147 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Purpose:	Generate an HDF5 file for testing H5FFV-10216
+ */
+#include "h5test.h"
+
+#define TESTFILE    "bad_offset.h5"
+#define GRP1        "group1"
+#define GRP2        "group2"
+#define DSET        "dsetA"
+#define SOFT1       "soft_one"
+#define SOFT2       "soft_two"
+
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ *              Generate an HDF5 file with groups, datasets and symbolic links. 
+ *              After the file is generated, write bad offset values to 
+ *              the heap at 3 locations in the file:
+ *              (A) Open the file:
+ *                  fd = HDopen(TESTFILE, O_RDWR, 0663);
+ *              (B) Position the file at:
+ *                  (1) HDlseek(fd, (HDoff_t)880, SEEK_SET);
+ *                      "/group1/group2": replace heap offset "8" by bad offset
+ *                  (2) HDlseek(fd, (HDoff_t)1512, SEEK_SET);
+ *                      "/dsetA": replace name offset into private heap "72" by bad offset 
+ *                  (3) HDlseek(fd, (HDoff_t)1616, SEEK_SET);
+ *                      /soft_one: replace link value offset in the scratch pad "32" by bad offset
+ *              (C) Write the bad offset value to the file for (1), (2) and (3):
+ *                  write(fd, &val, sizeof(val));
+ *
+ *              Note: if the groups/datasets/symbolic links are changed in the file,
+ *              the above locations need to be adjusted accordingly.
+ *
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    hid_t       fid = -1, gid1 = -1, gid2 = -1; /* File and group IDs */
+    hid_t       did = -1, sid = -1;             /* Dataset and dataspace IDs */
+    int         fd = -1;                        /* File descriptor */
+    int64_t     val = 999;                      /* Bad offset value */
+
+    /* Create the test file */
+    if((fid = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create two groups */
+    if((gid1 = H5Gcreate2(fid, GRP1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if((gid2 = H5Gcreate2(gid1, GRP2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the groups */
+    if(H5Gclose(gid1) < 0)
+        FAIL_STACK_ERROR
+    if(H5Gclose(gid2) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create soft links to the groups */
+    if(H5Lcreate_soft("/group1", fid, SOFT1, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if(H5Lcreate_soft("/group1/group2", fid, SOFT2, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create a dataset */
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+        FAIL_STACK_ERROR
+    if((did = H5Dcreate2(fid, DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <  0)
+        FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the dataspace */
+    if(H5Sclose(sid) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the file */
+    if(H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
+
+    /* 
+     * Write bad offset values at 3 locations in the file
+     */
+
+    /* Open the file */
+    if((fd = HDopen(TESTFILE, O_RDWR, 0663)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Position the file for /group1/group2: replace heap offset "8" by bad offset */
+    if(HDlseek(fd, (HDoff_t)880, SEEK_SET) < 0)
+        FAIL_STACK_ERROR
+    /* Write the bad offset value to the file */
+    if(HDwrite(fd, &val, sizeof(val)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Position the file for /dsetA: replace name offset into private heap "72" by bad offset */
+    if(HDlseek(fd, (HDoff_t)1512, SEEK_SET) < 0)
+        FAIL_STACK_ERROR
+    /* Write the bad offset value to the file */
+    if(HDwrite(fd, &val, sizeof(val)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Position the file for /soft_one: replace link value offset in the scratch pad "32" by bad offset */
+    if(HDlseek(fd, (HDoff_t)1616, SEEK_SET) < 0)
+        FAIL_STACK_ERROR
+    /* Write the bad offset value to the file */
+    if(HDwrite(fd, &val, sizeof(val)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the file */
+    if(HDclose(fd) < 0)
+        FAIL_STACK_ERROR
+
+    return EXIT_SUCCESS;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(gid1);
+        H5Gclose(gid2);
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+
+    return EXIT_FAILURE;
+} /* end main() */
+
diff --git a/test/tmisc.c b/test/tmisc.c
index 708ca9b..102325a 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -318,6 +318,11 @@ typedef struct
 #define MISC31_PROPNAME         "misc31_prop"
 #define MISC31_DTYPENAME        "dtype"
 
+/* Definitions for misc. test #33 */
+/* Note that this test file is generated by "gen_bad_offset.c" */
+/* and bad offset values are written to that file for testing */
+#define MISC33_FILE             "bad_offset.h5"
+
 /****************************************************************
 **
 **  test_misc1(): test unlinking a dataset from a group and immediately
@@ -5472,6 +5477,55 @@ test_misc32(void)
     
 } /* end test_misc32() */
 
+/****************************************************************
+**
+**  test_misc33(): Test for H5FFV-10216
+**      --verify that H5HL_offset_into() returns error if the
+**        input parameter "offset" exceeds heap data block size.
+**      --case (1), (2), (3) are scenarios that will traverse to the
+**        the 3 locations in the file having bad offset values to
+**        the heap.  (See description in gen_bad_offset.c)
+**
+****************************************************************/
+static void
+test_misc33(void)
+{
+    hid_t   fid = -1;   /* File ID */
+    const char *testfile = H5_get_srcdir_filename(MISC33_FILE); /* Corrected test file name */
+    H5O_info_t oinfo;   /* Structure for object metadata information */
+    herr_t  ret;        /* Generic return value */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing that bad offset into the heap returns error"));
+
+    /* Open the test file */
+    fid = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
+    CHECK(fid, FAIL, "H5Fopen");
+
+    /* Case (1) */
+    H5E_BEGIN_TRY {
+        ret = H5Oget_info_by_name(fid, "/soft_two", &oinfo, H5P_DEFAULT);
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5Oget_info_by_name");
+
+    /* Case (2) */
+    H5E_BEGIN_TRY {
+        ret = H5Oget_info_by_name(fid, "/dsetA", &oinfo, H5P_DEFAULT);
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5Oget_info_by_name");
+
+    /* Case (3) */
+    H5E_BEGIN_TRY {
+        ret = H5Oget_info_by_name(fid, "/soft_one", &oinfo, H5P_DEFAULT);
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5Oget_info_by_name");
+
+    /* Close the file */
+    ret = H5Fclose(fid);
+    CHECK(fid, FAIL, "H5Fclose");
+
+} /* end test_misc33() */
+
 
 /****************************************************************
 **
@@ -5520,6 +5574,7 @@ test_misc(void)
     test_misc30();      /* Exercise local heap loading bug where free lists were getting dropped */
     test_misc31();      /* Test Reentering library through deprecated routines after H5close() */
     test_misc32();      /* Test filter memory allocation functions */
+    test_misc33();      /* Test to verify that H5HL_offset_into() returns error if offset exceeds heap block */
 
 } /* test_misc() */