diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2016-01-05 02:48:22 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-01-05 02:48:22 (GMT) |
commit | 1b00123b2a0a2d77f1c19a473fce465cfa2bba9a (patch) | |
tree | e6749f6d6e5c22a7e6668165513d609982e8238c | |
parent | fd24af380a6666b94491614d3cece80aa3ed763d (diff) | |
download | hdf5-1b00123b2a0a2d77f1c19a473fce465cfa2bba9a.zip hdf5-1b00123b2a0a2d77f1c19a473fce465cfa2bba9a.tar.gz hdf5-1b00123b2a0a2d77f1c19a473fce465cfa2bba9a.tar.bz2 |
[svn-r28796] Description:
Bring r28795 from trunk to revise_chunks branch:
Clean up more memory allocation mis-matches.
Tested on:
Linux/32 2.6.x (jam) w/serial
MacOSX/64 10.11.2 (amazon) w/serial & parallel
-rw-r--r-- | src/H5E.c | 5 | ||||
-rw-r--r-- | src/H5PL.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1417,8 +1417,13 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, done: if(va_started) va_end(ap); +#ifdef H5_HAVE_VASPRINTF + if(tmp) + HDfree(tmp); +#else /* H5_HAVE_VASPRINTF */ if(tmp) H5MM_xfree(tmp); +#endif /* H5_HAVE_VASPRINTF */ FUNC_LEAVE_API(ret_value) } /* end H5Epush2() */ @@ -413,9 +413,9 @@ H5PL__init_path_table(void) */ origin_dl_path = HDgetenv("HDF5_PLUGIN_PATH"); if(NULL == origin_dl_path) - dl_path = HDstrdup(H5PL_DEFAULT_PATH); + dl_path = H5MM_strdup(H5PL_DEFAULT_PATH); else - dl_path = HDstrdup(origin_dl_path); + dl_path = H5MM_strdup(origin_dl_path); if(NULL == dl_path) HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path") @@ -425,7 +425,7 @@ H5PL__init_path_table(void) /* Check for too many directories in path */ if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM) HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table") - if(NULL == (H5PL_path_table_g[H5PL_num_paths_g] = HDstrdup(dir))) + if(NULL == (H5PL_path_table_g[H5PL_num_paths_g] = H5MM_strdup(dir))) HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path") H5PL_num_paths_g++; dir = HDstrtok(NULL, H5PL_PATH_SEPARATOR); |