diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2023-09-01 02:07:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 02:07:02 (GMT) |
| commit | cd1a6aabdb8a39721507b58fe2792497428e7828 (patch) | |
| tree | 262a99e0746e8264a1043a7e6cd37de2d1984fdb | |
| parent | 4646ac859c5c1ba45c8b864a0dbc713525467d1a (diff) | |
| download | hdf5-cd1a6aabdb8a39721507b58fe2792497428e7828.zip hdf5-cd1a6aabdb8a39721507b58fe2792497428e7828.tar.gz hdf5-cd1a6aabdb8a39721507b58fe2792497428e7828.tar.bz2 | |
Fix valgrind warning about write of uninitialized bytes (#3389) (#3465)
| -rw-r--r-- | src/H5FScache.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/H5FScache.c b/src/H5FScache.c index 28fe2a4..420582e 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -1185,8 +1185,9 @@ done: static herr_t H5FS__cache_sinfo_serialize(const H5F_t *f, void *_image, size_t len, void *_thing) { - H5FS_sinfo_t *sinfo = (H5FS_sinfo_t *)_thing; /* Pointer to the object */ - H5FS_iter_ud_t udata; /* User data for callbacks */ + H5FS_sinfo_t *sinfo = (H5FS_sinfo_t *)_thing; /* Pointer to the object */ + H5FS_iter_ud_t udata; /* User data for callbacks */ + ptrdiff_t gap_size; uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint8_t *chksum_image = NULL; /* Points to chksum location */ uint32_t metadata_chksum; /* Computed metadata checksum value */ @@ -1231,7 +1232,17 @@ H5FS__cache_sinfo_serialize(const H5F_t *f, void *_image, size_t len, void *_thi /* Compute checksum */ /* There may be empty space between entries and chksum */ - chksum_image = (uint8_t *)(_image) + len - H5FS_SIZEOF_CHKSUM; + chksum_image = (uint8_t *)(_image) + len - H5FS_SIZEOF_CHKSUM; + + /* + * If there is any empty space between the entries and + * checksum, make sure that the space is initialized + * before serializing it + */ + gap_size = chksum_image - image; + if (gap_size > 0) + memset(image, 0, (size_t)gap_size); + metadata_chksum = H5_checksum_metadata(_image, (size_t)(chksum_image - (uint8_t *)_image), 0); /* Metadata checksum */ UINT32ENCODE(chksum_image, metadata_chksum); |