2 files changed, 7 insertions, 0 deletions
diff --git a/src/H5MF.c b/src/H5MF.c
index 1c5c3af..6f1217f 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -2674,6 +2674,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 the free space info
      * and allocation/deallocation has occurred.
      */
diff --git a/test/dsets.c b/test/dsets.c
index 08555f7..5ce15ac 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -11328,6 +11328,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.
      */