diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2021-10-18 20:20:07 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2021-10-18 20:20:07 (GMT) |
| commit | 4c253cc332397a02cd172cb80d8d23d7161a485e (patch) | |
| tree | 241a0c04bc7c1a19dbc846c8487d5ada84cb0fd9 /src/H5MM.c | |
| parent | 7c5c0bb0f0e5d396b1a4afc2ed7797dcc7f0a0b0 (diff) | |
| parent | cc7c0eb910306b3e823867e8b9bb58204f0e1422 (diff) | |
| download | hdf5-4c253cc332397a02cd172cb80d8d23d7161a485e.zip hdf5-4c253cc332397a02cd172cb80d8d23d7161a485e.tar.gz hdf5-4c253cc332397a02cd172cb80d8d23d7161a485e.tar.bz2 | |
Merge branch 'develop' into selection_io
Diffstat (limited to 'src/H5MM.c')
| -rw-r--r-- | src/H5MM.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -449,11 +449,17 @@ H5MM_xstrdup(const char *s) FUNC_ENTER_NOAPI(NULL) +#if defined H5_MEMORY_ALLOC_SANITY_CHECK if (s) { if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") HDstrcpy(ret_value, s); - } /* end if */ + } +#else + if (s) + if (NULL == (ret_value = HDstrdup(s))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "string duplication failed") +#endif done: FUNC_LEAVE_NOAPI(ret_value) @@ -483,10 +489,15 @@ H5MM_strdup(const char *s) FUNC_ENTER_NOAPI(NULL) if (!s) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "NULL string not allowed") +#if defined H5_MEMORY_ALLOC_SANITY_CHECK if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") HDstrcpy(ret_value, s); +#else + if (NULL == (ret_value = HDstrdup(s))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "string duplication failed") +#endif done: FUNC_LEAVE_NOAPI(ret_value) |