From f12c2dc79c0d80186c01b2590bdf7be3761bcb6c Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 25 Oct 2023 20:04:40 -0700 Subject: [PATCH] Fixed a file handle leak in the core VFD When opening a file with the core VFD and a file image, if the file already exists, the file check would leak the POSIX file handle. Fixes GitHub issue #635 --- release_docs/RELEASE.txt | 7 +++++++ src/H5FDcore.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 291f72a8701..7266de3eea9 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -404,6 +404,13 @@ Bug Fixes since HDF5-1.14.0 release =================================== Library ------- + - Fixed a file handle leak in the core VFD + + When opening a file with the core VFD and a file image, if the file + already exists, the file check would leak the POSIX file handle. + + Fixes GitHub issue #635 + - Fixed some issues with chunk index metadata not getting read collectively when collective metadata reads are enabled diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 08b714dfa34..1aa8d4bf19c 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -754,8 +754,10 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr ((file_image_info.buffer == NULL) && (file_image_info.size == 0))); memset(&sb, 0, sizeof(sb)); if ((file_image_info.buffer != NULL) && !(H5F_ACC_CREAT & flags)) { - if (HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW) >= 0) + if ((fd = HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW)) >= 0) { + HDclose(fd); HGOTO_ERROR(H5E_FILE, H5E_FILEEXISTS, NULL, "file already exists"); + } /* If backing store is requested, create and stat the file * Note: We are forcing the O_CREAT flag here, even though this is