summaryrefslogtreecommitdiffstats
path: root/src/H5Dfill.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-08-25 21:08:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-08-25 21:08:49 (GMT)
commitddcae21908080ffbd40fcd5ce3244df5f391e02d (patch)
treeb4a6b336e60f8131c9eb4d03a0d534ece4744f25 /src/H5Dfill.c
parent02a65c468589eee54e3a4e6a851303792fe9a87d (diff)
downloadhdf5-ddcae21908080ffbd40fcd5ce3244df5f391e02d.zip
hdf5-ddcae21908080ffbd40fcd5ce3244df5f391e02d.tar.gz
hdf5-ddcae21908080ffbd40fcd5ce3244df5f391e02d.tar.bz2
[svn-r19298] Description:
Bring r19297 from trunk to 1.8 branch: Whack a few more memory errors exposed by valgrind. Make the debugging dump output a little bit prettier. Tested on: FreeBSD/32 6.3 (duty) w/debug (h5committested on trunk)
Diffstat (limited to 'src/H5Dfill.c')
-rw-r--r--src/H5Dfill.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index 4474661..1999dda 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -609,12 +609,14 @@ H5D_fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id)
done:
if(buf) {
/* Free dynamically allocated VL elements in fill buffer */
- if(fb_info->fill->type)
+ if(fb_info->fill->type) {
if(H5T_vlen_reclaim_elmt(buf, fb_info->fill->type, dxpl_id) < 0)
HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't reclaim vlen element")
- else
+ } /* end if */
+ else {
if(H5T_vlen_reclaim_elmt(buf, fb_info->mem_type, dxpl_id) < 0)
HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't reclaim vlen element")
+ } /* end else */
/* Free temporary fill buffer */
if(fb_info->fill_free_func)