diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-08-25 20:56:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-25 20:56:50 (GMT) |
| commit | 627f7c5e026a55f176d8dfcab51633cf3b704ce6 (patch) | |
| tree | b8ef6ca645521104c25a7b5538259bb449d51c58 /src/H5FDros3.c | |
| parent | 3dd60d914e762c6cf7d99646bc516015229176cd (diff) | |
| download | hdf5-627f7c5e026a55f176d8dfcab51633cf3b704ce6.zip hdf5-627f7c5e026a55f176d8dfcab51633cf3b704ce6.tar.gz hdf5-627f7c5e026a55f176d8dfcab51633cf3b704ce6.tar.bz2 | |
Convert some H5MM calls to standard C equivalents (#2382)
* H5MM_calloc and malloc are now mapped to stdlib C calls
* H5MM_memcpy now maps directly to memcpy in release builds
* H5MM_memcpy is still implemented as a separate function that
checks for buffer overlap when H5MM_DEBUG is defined
(default w/ debug builds)
* Switches many library memcpy calls to use H5MM_memcpy
* Fixes a possible zero allocation in H5Olayout.c
Diffstat (limited to 'src/H5FDros3.c')
| -rw-r--r-- | src/H5FDros3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FDros3.c b/src/H5FDros3.c index c6414af..19de079 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -809,13 +809,13 @@ H5Pset_fapl_ros3_token(hid_t fapl_id, const char *token) if (H5P_get(plist, ROS3_TOKEN_PROP_NAME, &token_src) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get token value"); - memcpy(token_src, token, HDstrlen(token) + 1); + H5MM_memcpy(token_src, token, HDstrlen(token) + 1); } else { token_src = (char *)malloc(sizeof(char) * (H5FD_ROS3_MAX_SECRET_TOK_LEN + 1)); if (token_src == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "cannot make space for token_src variable."); - memcpy(token_src, token, HDstrlen(token) + 1); + H5MM_memcpy(token_src, token, HDstrlen(token) + 1); if (H5P_insert(plist, ROS3_TOKEN_PROP_NAME, sizeof(char *), &token_src, NULL, NULL, NULL, NULL, H5FD__ros3_str_token_delete, H5FD__ros3_str_token_copy, H5FD__ros3_str_token_cmp, H5FD__ros3_str_token_close) < 0) |