mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6719] Purpose:

Browse Source 
Bug Fix

Description:
    A resource leak happened if the H5Fget_access_plist() function was
    called. What was happening: the driver ID and info parts of the
    property list copied in H5Fget_access_plist were being overwritten,
    but those properties were copied initially, so we lost information.

Solution:
    Before copying over those values, call the H5F_acs_close() function
    to close those values.

Platforms tested:
    Modi4 (Parallel & Fortran)
    Arabica (Fortran)
    Verbena (Fortran & C++)

Misc. update:
This commit is contained in:
Bill Wendling 2003-04-21 13:30:09 -05:00
parent 9e3ab7e5d2
commit 099e781c61
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/H5F.c
View File

@ -903,10 +903,18 @@ H5Fget_access_plist(hid_t file_id)
if(H5P_set(new_plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->lf->def_sdata_block_size)) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' cache size");
/*
* Since we're resetting the driver ID and info, close them if they
* exist in this new property list.
*/
if (H5F_acs_close(ret_value, NULL) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't free the old driver information");
if(H5P_set(new_plist, H5F_ACS_FILE_DRV_ID_NAME, &(f->shared->lf->driver_id)) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file driver ID");
driver_info = H5FD_fapl_get(f->shared->lf);
if(driver_info != NULL && H5P_set(new_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file driver info");