summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhendersonHDF <jhenderson@hdfgroup.org>2023-09-01 04:56:30 (GMT)
committerGitHub <noreply@github.com>2023-09-01 04:56:30 (GMT)
commit00d2ad9664f7bb36c02dd2594017099e38d6e1f8 (patch)
tree8601895354c2c95363a1b9127ec62aa8aa2e783e
parentb02dc7d9c0f83409bf55b4ca97061b5a8cd50b36 (diff)
downloadhdf5-00d2ad9664f7bb36c02dd2594017099e38d6e1f8.zip
hdf5-00d2ad9664f7bb36c02dd2594017099e38d6e1f8.tar.gz
hdf5-00d2ad9664f7bb36c02dd2594017099e38d6e1f8.tar.bz2
Fix compile failures with H5C_DO_MEMORY_SANITY_CHECKS enabled (#3388) (#3464)
-rw-r--r--src/H5Centry.c2
-rw-r--r--src/H5Cimage.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Centry.c b/src/H5Centry.c
index 41fbe0c..9b93a96 100644
--- a/src/H5Centry.c
+++ b/src/H5Centry.c
@@ -1571,7 +1571,7 @@ H5C__serialize_single_entry(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t *entry
if (NULL == (entry_ptr->image_ptr = H5MM_malloc(entry_ptr->size + H5C_IMAGE_EXTRA_SPACE)))
HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, FAIL, "memory allocation failed for on disk image buffer");
#if H5C_DO_MEMORY_SANITY_CHECKS
- H5MM_memcpy(((uint8_t *)entry_ptr->image_ptr) + image_size, H5C_IMAGE_SANITY_VALUE,
+ H5MM_memcpy(((uint8_t *)entry_ptr->image_ptr) + entry_ptr->size, H5C_IMAGE_SANITY_VALUE,
H5C_IMAGE_EXTRA_SPACE);
#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
} /* end if */
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index c578deb..4fa3a1c 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -2687,7 +2687,8 @@ H5C__reconstruct_cache_entry(const H5F_t *f, H5C_t *cache_ptr, const uint8_t **b
if (NULL == (pf_entry_ptr->image_ptr = H5MM_malloc(pf_entry_ptr->size + H5C_IMAGE_EXTRA_SPACE)))
HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "memory allocation failed for on disk image buffer");
#if H5C_DO_MEMORY_SANITY_CHECKS
- H5MM_memcpy(((uint8_t *)pf_entry_ptr->image_ptr) + size, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE);
+ H5MM_memcpy(((uint8_t *)pf_entry_ptr->image_ptr) + pf_entry_ptr->size, H5C_IMAGE_SANITY_VALUE,
+ H5C_IMAGE_EXTRA_SPACE);
#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
/* Copy the entry image from the cache image block */