From 727f26263fd42303314a1e9b2c074205500f9b07 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 13 Jan 2004 13:56:32 -0500 Subject: [svn-r8057] Purpose: Bug fix Description: Plug another small memory leak for fill-values. Platforms tested: FreeBSD 4.9 (sleipnir) too minor to require h5committest --- release_docs/RELEASE.txt | 4 ++-- src/H5D.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index c3fc3ad..e9610e4 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -101,11 +101,11 @@ Bug Fixes since HDF5-1.6.0 release Library ------- + - Fixed small internal memory leaks of fill-value information. + QAK - 2004/01/13 - Fixed bug that caused variable-length datatypes (strings or sequences) used for datasets in files with objects that were unlinked to fail to be read/written to a file. QAK - 2004/01/13 - - Fixed small internal memory leak of fill-value information. - QAK - 2004/01/06 - Detect situation where szip 'pixels per block' is larger than the fastest changing dimension of a dataset's chunk size and disallow this (due to limits in szip library). QAK - 2003/12/31 diff --git a/src/H5D.c b/src/H5D.c index bdd1b41..34c9642 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -2432,6 +2432,10 @@ H5D_open_oid(const H5G_entry_t *ent, hid_t dxpl_id) ret_value = dataset; done: + /* Release fill value information */ + if (H5O_reset(H5O_FILL_ID, &fill) <0) + HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, NULL, "unable to release fill-value info") + if (ret_value==NULL && dataset) { if (H5F_addr_defined(dataset->ent.header)) { if(H5O_close(&(dataset->ent))<0) @@ -2449,7 +2453,7 @@ done: H5FL_FREE(H5D_t,dataset); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5D_open_oid() */ /*------------------------------------------------------------------------- -- cgit v0.12