diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-16 23:02:06 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-16 23:02:06 (GMT) |
commit | 5c80d3d91284bdcd048d9325b1a601d0ddfca8bd (patch) | |
tree | 8ad7066b9cc25f160c910955555492640a9bc9ba /src/H5MM.c | |
parent | a98747c0f94386f7505210e78cd4b385682b0eba (diff) | |
download | hdf5-5c80d3d91284bdcd048d9325b1a601d0ddfca8bd.zip hdf5-5c80d3d91284bdcd048d9325b1a601d0ddfca8bd.tar.gz hdf5-5c80d3d91284bdcd048d9325b1a601d0ddfca8bd.tar.bz2 |
- Added H5MMprivate.h #includes where needed
- Added casts to quiet H5MM_memcpy warnings
- Removed char * casts from HDmemcpy
Diffstat (limited to 'src/H5MM.c')
-rw-r--r-- | src/H5MM.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -568,7 +568,8 @@ H5MM_xfree(void *mem) /*------------------------------------------------------------------------- * Function: H5MM_memcpy * - * Purpose: Like memcpy(3) but with a check for buffer overlap. + * Purpose: Like memcpy(3) but with sanity checks on the parameters, + * particularly buffer overlap. * * Return: Success: pointer to dest * Failure: NULL @@ -588,7 +589,8 @@ H5MM_memcpy(void *dest, const void *src, size_t n) HDassert(dest); HDassert(src); - HDassert(dest >= src + n || src >= dest + n); + HDassert(n > 0); + HDassert((char *)dest >= (const char *)src + n || (const char *)src >= (char *)dest + n); ret = HDmemcpy(dest, src, n); |