summaryrefslogtreecommitdiffstats
path: root/src/H5MM.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-06-22 00:30:16 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-06-22 00:31:56 (GMT)
commit5a6afeffd44c3ba51ce0e0fa11053c83e0807685 (patch)
tree886d2428bf9db02561fa4edf77eeb7234ec5b7c3 /src/H5MM.c
parent7ef0e3f941b96b9fbec0787d896e144f77b746bc (diff)
downloadhdf5-5a6afeffd44c3ba51ce0e0fa11053c83e0807685.zip
hdf5-5a6afeffd44c3ba51ce0e0fa11053c83e0807685.tar.gz
hdf5-5a6afeffd44c3ba51ce0e0fa11053c83e0807685.tar.bz2
Put the memcpy overlap check back into H5MM.
Diffstat (limited to 'src/H5MM.c')
-rw-r--r--src/H5MM.c8
1 files changed, 3 insertions, 5 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)