diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-22 01:45:11 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-22 01:45:11 (GMT) |
| commit | 2d1017e381631c91a1e2633708b6e75d13553830 (patch) | |
| tree | 886d2428bf9db02561fa4edf77eeb7234ec5b7c3 /src/H5MM.c | |
| parent | 7ef0e3f941b96b9fbec0787d896e144f77b746bc (diff) | |
| parent | 5a6afeffd44c3ba51ce0e0fa11053c83e0807685 (diff) | |
| download | hdf5-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.
Diffstat (limited to 'src/H5MM.c')
| -rw-r--r-- | src/H5MM.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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) |