summaryrefslogtreecommitdiffstats
path: root/src/H5T.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2011-11-08 22:34:00 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2011-11-08 22:34:00 (GMT)
commit68da0f773642748d996b498e28b0d39dc3b08710 (patch)
tree3f1e7b61adad313a72c6a61fc129ca28e2ff40dd /src/H5T.c
parent264fa3562aa40b083bbfea7bd27731086e19aa9e (diff)
downloadhdf5-68da0f773642748d996b498e28b0d39dc3b08710.zip
hdf5-68da0f773642748d996b498e28b0d39dc3b08710.tar.gz
hdf5-68da0f773642748d996b498e28b0d39dc3b08710.tar.bz2
[svn-r21734] Issue 7582 - The library allowed the conversion of strings between ASCII and UTF8. I corrected it by adding a condition check in H5T_conv_s_s and H5T_conv_vlen to report an error under this situation.
Tested on jam, koala, linew.
Diffstat (limited to 'src/H5T.c')
-rw-r--r--src/H5T.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 2519a8f..688dfb3 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -4464,7 +4464,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
path->cdata.command = H5T_CONV_INIT;
if((H5T_g.soft[i].func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, dxpl_id) < 0) {
HDmemset(&(path->cdata), 0, sizeof(H5T_cdata_t));
- H5E_clear_stack(NULL); /*ignore the error*/
+ H5E_clear_stack(H5E_DEFAULT); /*ignore the error*/
} /* end if */
else {
HDstrcpy(path->name, H5T_g.soft[i].name);