From 6462c67b6578e48c1ef6d847be59c0b5e3598a50 Mon Sep 17 00:00:00 2001 From: Jacob Smith Date: Fri, 29 May 2020 14:27:14 -0500 Subject: Patch a few holes in the Splitter VFD implementation. * Missing logfile close on driver-open failure. * Initialize empty string in test/vfd (logfile path in W/O compat check). --- src/H5FDsplitter.c | 3 +++ test/vfd.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c index 13816a5..4ed3c4a 100644 --- a/src/H5FDsplitter.c +++ b/src/H5FDsplitter.c @@ -818,6 +818,9 @@ done: if (file_ptr->wo_file) { H5FD_close(file_ptr->wo_file); } + if (file_ptr->logfp) { + HDfclose(file_ptr->logfp); + } H5FL_FREE(H5FD_splitter_t, file_ptr); } } /* end if error */ diff --git a/test/vfd.c b/test/vfd.c index 97995d2..d94aec6 100644 --- a/test/vfd.c +++ b/test/vfd.c @@ -2490,7 +2490,7 @@ driver_is_splitter_compatible(hid_t fapl_id) { H5FD_splitter_vfd_config_t vfd_config; hid_t split_fapl_id = H5I_INVALID_HID; - herr_t ret; + herr_t ret = SUCCEED; int ret_value = 0; split_fapl_id = H5Pcreate(H5P_FILE_ACCESS); @@ -2503,6 +2503,7 @@ driver_is_splitter_compatible(hid_t fapl_id) vfd_config.rw_fapl_id = H5P_DEFAULT; vfd_config.wo_fapl_id = fapl_id; HDstrncpy(vfd_config.wo_path, "nonesuch", H5FD_SPLITTER_PATH_MAX); + *vfd_config.log_file_path = '\0'; H5E_BEGIN_TRY { ret = H5Pset_fapl_splitter(split_fapl_id, &vfd_config); -- cgit v0.12