summaryrefslogtreecommitdiffstats
path: root/src/H5SMcache.c
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-07-01 22:08:11 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-07-01 22:08:11 (GMT)
commit9804fed58f4f30843d406861a2daf67944c244de (patch)
tree37ef75018769aa13ad604dc9be42dfd81d8a9812 /src/H5SMcache.c
parent980db9e85b902bcd0e183e00c5ebe02ec365dc22 (diff)
downloadhdf5-9804fed58f4f30843d406861a2daf67944c244de.zip
hdf5-9804fed58f4f30843d406861a2daf67944c244de.tar.gz
hdf5-9804fed58f4f30843d406861a2daf67944c244de.tar.bz2
[svn-r27320] Fix uninitialized memory write valgrind errors in trunk. Did this by modifying
metadata cache clients to clear unused memory in the buffer after serializing. Tested: ummon; jam, koala, ostrich (h5committest)
Diffstat (limited to 'src/H5SMcache.c')
-rw-r--r--src/H5SMcache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index d8c0824..293088c 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -675,13 +675,13 @@ H5SM__cache_list_serialize(const H5F_t *f, void *_image, size_t len,
computed_chksum = H5_checksum_metadata(_image, (size_t)(image - (uint8_t *)_image), 0);
UINT32ENCODE(image, computed_chksum);
+ /* sanity check */
+ HDassert((size_t)(image - (uint8_t *)_image) <= list->header->list_size);
+
#ifdef H5_CLEAR_MEMORY
HDmemset(image, 0, (list->header->list_size - (size_t)(image - (uint8_t *)_image)));
#endif /* H5_CLEAR_MEMORY */
- /* sanity check */
- HDassert((size_t)(image - (uint8_t *)_image) <= list->header->list_size);
-
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SM__cache_list_serialize() */