diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2013-02-27 19:22:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2013-02-27 19:22:27 (GMT) |
| commit | b2f2370b1f26b8864c70f7ccc8cc023260ca99a0 (patch) | |
| tree | f9bc7e59d6e48d5de16c21f48b214489d58725b3 /src/H5T.c | |
| parent | e8fa6193f5ae4713f2ca9ff02965951c9d97016b (diff) | |
| download | hdf5-b2f2370b1f26b8864c70f7ccc8cc023260ca99a0.zip hdf5-b2f2370b1f26b8864c70f7ccc8cc023260ca99a0.tar.gz hdf5-b2f2370b1f26b8864c70f7ccc8cc023260ca99a0.tar.bz2 | |
[svn-r23321] Description:
Merge r23313 from trunk to 1.8 branch:
Bring changes from Coverity branch to the trunk:
r20612:
Changed string functions to versions with string length to fix coverity issues
922, 942 and 943.
r20614:
Use HDsnprintf. --gh
r20675:
Fix for coverity #1714 due to the fix for #810.
Use HDfree() instead of H5MM_xfree().
r20678:
Repaired coverity issue #598 -- failure to check return value from a
call to fstat(), or to tidy up in the event of failure.
r20679:
Use HDstrncpy. --gh
r20681:
Use HDstrncat and HDstrncpy. --gh
Tested on:
Mac OSX/64 10.8.2 (amazon) w/debug, C++ & FORTRAN
(too minor to require h5committest)
Diffstat (limited to 'src/H5T.c')
| -rw-r--r-- | src/H5T.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4391,7 +4391,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_g.apaths = 128; if(NULL == (H5T_g.path[0] = H5FL_CALLOC(H5T_path_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for no-op conversion path") - HDstrcpy(H5T_g.path[0]->name, "no-op"); + HDsnprintf(H5T_g.path[0]->name, sizeof(H5T_g.path[0]->name), "no-op"); H5T_g.path[0]->func = H5T__conv_noop; H5T_g.path[0]->cdata.command = H5T_CONV_INIT; if(H5T__conv_noop(FAIL, FAIL, &(H5T_g.path[0]->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) { @@ -4459,7 +4459,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, path->name[H5T_NAMELEN - 1] = '\0'; } /* end if */ else - HDstrcpy(path->name, "NONAME"); + HDsnprintf(path->name, sizeof(path->name), "NONAME"); if(NULL == (path->src = H5T_copy(src, H5T_COPY_ALL))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy datatype for conversion path") if(NULL == (path->dst = H5T_copy(dst, H5T_COPY_ALL))) |