diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-12-07 00:03:00 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-12-07 00:03:00 (GMT) |
| commit | a366c0a4925afd53c55f3e35d1770f12da6d6178 (patch) | |
| tree | c4be96899995de3baf3ba3e1b9459a310b190f29 /src/H5Fint.c | |
| parent | feaaae4897d4c2d9f83a2f93224123a4c5e009c7 (diff) | |
| download | hdf5-a366c0a4925afd53c55f3e35d1770f12da6d6178.zip hdf5-a366c0a4925afd53c55f3e35d1770f12da6d6178.tar.gz hdf5-a366c0a4925afd53c55f3e35d1770f12da6d6178.tar.bz2 | |
Fixed a valgrind problem in file shutdown exposed by the swmr.c test.
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 363812d..a14d556 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -1185,8 +1185,15 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, } /* end if */ /* Create the 'top' file structure */ - if(NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf))) + if(NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf))) { + /* If the file has not been opened yet and the struct returned is + * NULL, H5FD_close() will never be called via H5F_dest() so we + * have to close lf here before heading to the error handling. + */ + if(H5FD_close(lf) < 0) + HDONE_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to close low-level file info") HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to initialize file structure") + } /* end if */ /* Need to set status_flags in the superblock if the driver has a 'lock' method */ if(drvr->lock) @@ -1342,10 +1349,9 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, ret_value = file; done: - if(!ret_value && file) + if((NULL == ret_value) && file) if(H5F_dest(file, dxpl_id, FALSE) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "problems closing file") - FUNC_LEAVE_NOAPI(ret_value) } /* end H5F_open() */ |