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/H5Gnode.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/H5Gnode.c')
| -rw-r--r-- | src/H5Gnode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 72b3633..b79b7d2 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -672,7 +672,7 @@ H5G__node_insert(H5F_t *f, haddr_t addr, void H5_ATTR_UNUSED *_lt_key, if(NULL == (snrt = (H5G_node_t *)H5AC_protect(f, H5AC_SNODE, *new_node_p, f, H5AC__NO_FLAGS_SET))) HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to split symbol table node") - HDmemcpy(snrt->entry, sn->entry + H5F_SYM_LEAF_K(f), + H5MM_memcpy(snrt->entry, sn->entry + H5F_SYM_LEAF_K(f), H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t)); snrt->nsyms = H5F_SYM_LEAF_K(f); snrt_flags |= H5AC__DIRTIED_FLAG; @@ -1262,7 +1262,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, char *link_name; /* Pointer to value of soft link */ /* Make a temporary copy, so that it will not change the info in the cache */ - HDmemcpy(&tmp_src_ent, src_ent, sizeof(H5G_entry_t)); + H5MM_memcpy(&tmp_src_ent, src_ent, sizeof(H5G_entry_t)); /* Set up group location for soft link to start in */ H5G_name_reset(&grp_path); |