diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-17 02:58:38 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-17 02:58:38 (GMT) |
| commit | f0d22e54c705285b10f8192be6b26ba1a7ae3fbc (patch) | |
| tree | 8ad7066b9cc25f160c910955555492640a9bc9ba /src/H5SM.c | |
| parent | d2591ce377bb027d210a100c5a738e3cdd82378e (diff) | |
| parent | 5c80d3d91284bdcd048d9325b1a601d0ddfca8bd (diff) | |
| download | hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.zip hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.tar.gz hdf5-f0d22e54c705285b10f8192be6b26ba1a7ae3fbc.tar.bz2 | |
Merge pull request #1604 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '5c80d3d91284bdcd048d9325b1a601d0ddfca8bd':
- Added H5MMprivate.h #includes where needed - Added casts to quiet H5MM_memcpy warnings - Removed char * casts from HDmemcpy
Added an H5MM_memcpy call that checks for buffer overlap.
Diffstat (limited to 'src/H5SM.c')
| -rw-r--r-- | src/H5SM.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2318,7 +2318,7 @@ H5SM__read_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence, HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, H5_ITER_ERROR, "memory allocation failed") /* Copy the encoded message into the buffer to return */ - HDmemcpy(udata->encoding_buf, mesg->raw, udata->buf_size); + H5MM_memcpy(udata->encoding_buf, mesg->raw, udata->buf_size); /* Found the message we were looking for */ ret_value = H5_ITER_STOP; @@ -2356,7 +2356,7 @@ H5SM__read_mesg_fh_cb(const void *obj, size_t obj_len, void *_udata) HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "memory allocation failed") /* Copy the message from the heap */ - HDmemcpy(udata->encoding_buf, obj, obj_len); + H5MM_memcpy(udata->encoding_buf, obj, obj_len); udata->buf_size = obj_len; done: |