diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2019-06-22 16:39:25 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2019-06-22 16:39:25 (GMT) |
| commit | 128853b58a046ef051c2a2f40924028f589238bb (patch) | |
| tree | a94e83cfa69f557c16aeec6ae5a2486ec87a4967 /src | |
| parent | 3dcc89625cf996d6166dc65e4c2d4c703b687424 (diff) | |
| parent | df4ec243d4f22b28671f91ad04961cd178fdab70 (diff) | |
| download | hdf5-128853b58a046ef051c2a2f40924028f589238bb.zip hdf5-128853b58a046ef051c2a2f40924028f589238bb.tar.gz hdf5-128853b58a046ef051c2a2f40924028f589238bb.tar.bz2 | |
Merge branch 'develop' into feature/update_gcc_flags
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5MM.c | 8 | ||||
| -rw-r--r-- | src/H5Pint.c | 4 |
2 files changed, 5 insertions, 7 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) 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) |