mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r462] Plugged several memory leaks in the hyperslab selection iterators.

Browse Source
This commit is contained in:
Quincey Koziol 1998-07-07 16:53:41 -05:00
parent 1bdb53fb6a
commit 5ab92f6c59
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/H5D.c
View File

@ -29,7 +29,9 @@ static char RcsId[] = "@(#)$Revision$";
#include <H5Pprivate.h> /* Property lists */
#include <H5Zprivate.h> /* Data compression */
#ifdef QAK
int qak_debug=0;
#endif /* QAK */
#define PABLO_MASK H5D_mask
@ -1375,7 +1377,7 @@ printf("%s: check 2.0\n",FUNC);
}
if (FAIL == (sconv_func.binit)(&(dataset->layout), mem_space, &bkg_iter)) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize memory selection information");
"unable to initialize background selection information");
}
#ifdef QAK
printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
@ -1517,13 +1519,16 @@ printf("%s: check 9.0\n",FUNC);
done:
if (src_id >= 0) H5I_dec_ref(src_id);
if (dst_id >= 0) H5I_dec_ref(dst_id);
if (tconv_buf && NULL==xfer_parms->tconv_buf) {
H5MM_xfree(tconv_buf);
}
if (bkg_buf && NULL==xfer_parms->bkg_buf) {
H5MM_xfree (bkg_buf);
}
if (free_this_space) H5S_close (free_this_space);
if (tconv_buf && NULL==xfer_parms->tconv_buf)
H5MM_xfree(tconv_buf);
if (bkg_buf && NULL==xfer_parms->bkg_buf)
H5MM_xfree (bkg_buf);
if (free_this_space)
H5S_close (free_this_space);
/* Release selection iterators */
H5S_sel_iter_release(file_space,&file_iter);
H5S_sel_iter_release(mem_space,&mem_iter);
H5S_sel_iter_release(mem_space,&bkg_iter);
FUNC_LEAVE(ret_value);
}
@ -1854,13 +1859,16 @@ printf("%s: check 6.0\n",FUNC);
done:
if (src_id >= 0) H5I_dec_ref(src_id);
if (dst_id >= 0) H5I_dec_ref(dst_id);
if (tconv_buf && NULL==xfer_parms->tconv_buf) {
if (tconv_buf && NULL==xfer_parms->tconv_buf)
H5MM_xfree(tconv_buf);
}
if (bkg_buf && NULL==xfer_parms->bkg_buf) {
if (bkg_buf && NULL==xfer_parms->bkg_buf)
H5MM_xfree (bkg_buf);
}
if (free_this_space) H5S_close (free_this_space);
if (free_this_space)
H5S_close (free_this_space);
/* Release selection iterators */
H5S_sel_iter_release(file_space,&file_iter);
H5S_sel_iter_release(mem_space,&mem_iter);
H5S_sel_iter_release(mem_space,&bkg_iter);
FUNC_LEAVE(ret_value);
}