summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-06-22 01:45:11 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-06-22 01:45:11 (GMT)
commit2d1017e381631c91a1e2633708b6e75d13553830 (patch)
tree886d2428bf9db02561fa4edf77eeb7234ec5b7c3
parent7ef0e3f941b96b9fbec0787d896e144f77b746bc (diff)
parent5a6afeffd44c3ba51ce0e0fa11053c83e0807685 (diff)
downloadhdf5-2d1017e381631c91a1e2633708b6e75d13553830.zip
hdf5-2d1017e381631c91a1e2633708b6e75d13553830.tar.gz
hdf5-2d1017e381631c91a1e2633708b6e75d13553830.tar.bz2
Merge pull request #1763 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:memcpy_buffer_overlap_check to develop
* commit '5a6afeffd44c3ba51ce0e0fa11053c83e0807685': Put the memcpy overlap check back into H5MM.
-rw-r--r--src/H5MM.c8
-rw-r--r--src/H5Pint.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/src/H5MM.c b/src/H5MM.c
index 1a5a149..85d82a9 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -589,13 +589,11 @@ H5MM_memcpy(void *dest, const void *src, size_t n)
HDassert(dest);
HDassert(src);
-#if 0
- /* Commented out while we investigate overlapping buffers in the
- * parallel filter code (HDFFV-10735).
- */
+
+ /* Check for buffer overlap */
HDassert((char *)dest >= (const char *)src + n || (const char *)src >= (char *)dest + n);
-#endif
+ /* Copy */
ret = HDmemcpy(dest, src, n);
FUNC_LEAVE_NOAPI(ret)
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 04411a5..0670adc 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -3133,7 +3133,7 @@ H5P__class_get(const H5P_genclass_t *pclass, const char *name, void *value)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
/* Copy the property value */
- HDmemcpy(value, prop->value, prop->size);
+ H5MM_memcpy(value, prop->value, prop->size);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -3189,7 +3189,7 @@ H5P__class_set(const H5P_genclass_t *pclass, const char *name, const void *value
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "property has zero size")
/* Copy the property value */
- HDmemcpy(prop->value, value, prop->size);
+ H5MM_memcpy(prop->value, value, prop->size);
done:
FUNC_LEAVE_NOAPI(ret_value)