Merge remote-tracking branch 'origin/develop' into vol_cleanup

README.md

@@ -28,17 +28,17 @@ tools, and services at [The HDF Group's website](https://www.hdfgroup.org/).
 
 DOCUMENTATION
 -------------
-This release is fully functional for the API described in the documentation.
+Documentation for all HDF software is available at:
 
-   https://hdfgroup.github.io/hdf5/develop/_l_b_a_p_i.html
+   https://support.hdfgroup.org/documentation/index.html
 
-Full Documentation and Programming Resources for this release can be found at
+Documentation for the current HDF5 library release is available at:
 
-   https://hdfgroup.github.io/hdf5/develop/index.html
+   https://support.hdfgroup.org/releases/hdf5/latest-docs.html
 
-The latest doxygen documentation generated on changes to develop is available at:
+The latest Doxygen documentation generated on changes to `develop`, which does **not** correspond to any particular library release, is available at:
 
-   https://hdfgroup.github.io/hdf5/develop
+   https://hdfgroup.github.io/hdf5/develop 
 
 See the [RELEASE.txt](release_docs/RELEASE.txt) file in the [release_docs/](release_docs/) directory for information specific
 to the features and updates included in this release of the library.

config/cmake/examples/CTestScript.cmake

@@ -11,7 +11,7 @@
 #
 cmake_minimum_required (VERSION 3.18)
 ########################################################
-# For any comments please contact cdashhelp@hdfgroup.org
+# For any comments please contact help@hdfgroup.org
 #
 ########################################################
 # -----------------------------------------------------------

config/cmake/examples/HDF5_Examples.cmake.in

@@ -114,7 +114,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PAC
 #endif()
 
 ###############################################################################################################
-# For any comments please contact cdashhelp@hdfgroup.org
+# For any comments please contact help@hdfgroup.org
 #
 ###############################################################################################################
 

config/cmake/scripts/CTestScript.cmake

@@ -12,7 +12,7 @@
 cmake_minimum_required (VERSION 3.18)
 ########################################################
 # This dashboard is maintained by The HDF Group
-# For any comments please contact cdashhelp@hdfgroup.org
+# For any comments please contact help@hdfgroup.org
 #
 ########################################################
 # -----------------------------------------------------------

release_docs/RELEASE_PROCESS.md

@@ -122,12 +122,43 @@ For more information on the HDF5 versioning and backward and forward compatibili
 12. Once binaries are ready to be tested, send an e-mail notification or update the Confluence test dashboard page indicating source and binary test assignments and when results should be made available. 
 13. Use the pre-release source packages to build and test HDF5 on assigned platforms by hand. Build both shared and static libraries, Fortran, C++, and szip, and any additional configurations required on specific remote platforms based on customer support needs.
 14. Use the pre-release binary packages found in /mnt/scr1/pre-release/hdf5/vXYZ/pre-\<n\>/binaries/{UNIX, Windows} to test according to the binary testing procedures for your assigned platforms. 
-15. Scripted Testing: 
-    - UNIX: [Scripted Binary Testing of HDF5 on UNIX systems (this is missing)]() 
-    - Windows: [Testing HDF5 Binaries(this is missing)]() 
+15. Initial Testing: 
+    - Installation Using Installer Binary
+        - Execute the install package
+        - Follow prompts
+    - Uncompress Directory Image Binary
+        - Extract the package
+    - After Installation
+        - The examples folder, HDF5Examples, located in the HDF5 install folder, can be built and tested with CMake and the supplied
+            HDF5_Examples.cmake file. The HDF5_Examples.cmake expects HDF5 to have been installed in the default location with same compilers (see the
+            libhdf5.settings file in the lib install folder). Also, the CMake utility should be installed.
+
+    - To test the installation with the examples;
+        - Create a directory to run the examples.
+        - Copy HDF5Examples folder to this directory.
+        - Copy CTestScript.cmake to this directory.
+        - Copy HDF5_Examples.cmake to this directory.
+        - Copy HDF5_Examples_options.cmake to this directory.
+        - The default source folder is defined as "HDF5Examples". It can be changed with the CTEST_SOURCE_NAME script option.
+        - The default installation folder should be visible in the script. It can be changed with the INSTALLDIR script option.
+        - The default ctest configuration is defined as "Release". It can be changed
+            with the CTEST_CONFIGURATION_TYPE script option. Note that this must
+            be the same as the value used with the -C command line option.
+        - The default build configuration is defined to build and use static libraries.
+            Shared libraries can be used with the STATICONLYLIBRARIES script option set to "NO".
+        - Other options can be changed by editing the HDF5_Examples_options.cmake file.
+    - If the defaults are okay, execute from this directory:
+        - ctest -S HDF5_Examples.cmake -C Release -V -O test.log
+    - If the defaults need change, execute from this directory:
+        - ctest -S HDF5_Examples.cmake,CTEST_SOURCE_NAME=MyExamples,INSTALLDIR=MyLocation -C Release -V -O test.log
+        - When executed, the ctest script will save the results to the log file, test.log, as
+            indicated by the ctest command. If you wish to see more build and test information,
+            add "-VV" to the ctest command. The output should show;
+            100% tests passed, 0 tests failed out of 206 (all options).
+    - For more information see USING_CMake_Examples.txt in the install folder.
 16. Manual Testing (i.e. verifying correct test outcomes via visual inspection): 
-    - Use this if UNIX test script is not reporting correct results, yet binaries look OK. 
-    - UNIX: [Manual Binary Testing of HDF5 on Unix systems (this is missing)]() 
+    - Inspect text documents for correct versions and names. 
+    - Inspect the doxygen files in the share/html directory open index.html .
 17. Update the test results Confluence page with status/outcome of all test assignments.
 18. If any test source (hdf-forum, clients, internal testers, automated regression suite) identifies any issues: 
     - a) Enter the issue in JIRA summarizing the failure if it is not already there. 

src/H5Bcache.c

@@ -179,6 +179,12 @@ H5B__cache_deserialize(const void *_image, size_t len, void *_udata, bool H5_ATT
     if (bt->nchildren > shared->two_k)
         HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "number of children is greater than maximum");
 
+    /* Check in case of level is corrupted, it is unreasonable for level to be
+       larger than the number of entries */
+    if (bt->level > bt->nchildren)
+        HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL,
+                    "level cannot be greater than the number of children, possibly corrupted");
+
     /* Sibling pointers */
     if (H5_IS_BUFFER_OVERFLOW(image, H5F_sizeof_addr(udata->f), p_end))
         HGOTO_ERROR(H5E_BTREE, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");

src/H5VLmodule.h

@@ -468,7 +468,7 @@
  *     } H5L_info2_t;
  * \endcode
  *
- * <h4>H5Literate() and H5Lvisit() → H5Literte2() and H5Lvisit2()</h4>
+ * <h4>H5Literate() and H5Lvisit() → H5Literate2() and H5Lvisit2()</h4>
  * The callback used in these API calls used the old #H5L_info_t struct, which used
  * addresses instead of tokens. These callbacks were versioned in the C library and
  * now take modified #H5L_iterate2_t callbacks which use the new token-based info

test/ttsafe_attr_vlen.c

@@ -157,7 +157,7 @@ tts_attr_vlen_thread(void H5_ATTR_UNUSED *client_data)
     VERIFY_STR(string_attr_check, string_attr, "H5Aread");
 
     /* Free the attribute data */
-    ret = H5Dvlen_reclaim(atid, asid, H5P_DEFAULT, &string_attr_check);
+    ret = H5Treclaim(atid, asid, H5P_DEFAULT, &string_attr_check);
     CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     /* Close IDs */