Merge pull request #2795 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr2020:hdf5_bmr2020_addrsani to develop

* commit '5352b1dbc92313d91d3502dd8352352abe8749a7':
  Fixed typo
  Fix HDFFV-11101

3 files changed, 8 insertions, 1 deletions

diff --git a/examples/h5_cmprss.c b/examples/h5_cmprss.c
index 5feadd3..97f6567 100644
--- a/examples/h5_cmprss.c
+++ b/examples/h5_cmprss.c
@@ -98,7 +98,7 @@ int main () {
 
     for (i=0; i<numfilt; i++) {
        nelmts = 0;
-       filter_type = H5Pget_filter2 (plist_id, 0, &flags, &nelmts, NULL, 0, NULL,
+       filter_type = H5Pget_filter2 (plist_id, i, &flags, &nelmts, NULL, 0, NULL,
                      &filter_info);
        printf ("Filter Type: ");
        switch (filter_type) {
diff --git a/src/H5MF.c b/src/H5MF.c
index aa65db2..5e61751 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -2645,6 +2645,10 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
     HDassert(f->shared);
     HDassert(fsm_settled);
 
+    /* Initialize structs */
+    HDmemset(&fsinfo, 0, sizeof(fsinfo));
+    HDmemset(&fs_stat, 0, sizeof(fs_stat));
+
     /*
      * Only need to settle things if we are persisting free space and
      * the private property in f->shared->null_fsm_addr is not enabled.
diff --git a/test/dsets.c b/test/dsets.c
index d5c11be..ae917cc 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -11334,6 +11334,9 @@ test_bt2_hdr_fd(const char *env_h5_driver, hid_t fapl)
 
     TESTING("Version 2 B-tree chunk index header flush dependencies handled correctly");
 
+    /* Initialize struct */
+    HDmemset(&info, 0, sizeof(info));
+
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */