summaryrefslogtreecommitdiffstats
path: root/src/H5T.c
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2010-04-08 18:41:42 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2010-04-08 18:41:42 (GMT)
commit68a140d2cb284dc620306b5a48ea22b49c9dd775 (patch)
tree8f793ba36720fd96178d975b52b764988266ee00 /src/H5T.c
parentee7791d61c7854afeee048024ed47c191b4cd99e (diff)
downloadhdf5-68a140d2cb284dc620306b5a48ea22b49c9dd775.zip
hdf5-68a140d2cb284dc620306b5a48ea22b49c9dd775.tar.gz
hdf5-68a140d2cb284dc620306b5a48ea22b49c9dd775.tar.bz2
[svn-r18536] Purpose: Fix bug 1815
Description: Attempting to copy an object with NULL references (all bytes zero) with the H5O_COPY_EXPAND_REFERENCE_FLAG flag set would cause a failure or an assertion (depending on whether it was in debug mode). Changed copy routine to detect NULL references (object and region) and avoid attempting to expand the reference in this case. Tested: jam, linew, amani (h5committest)
Diffstat (limited to 'src/H5T.c')
-rw-r--r--src/H5T.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 4b77559..7dfe0f2 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1863,12 +1863,6 @@ H5T_get_class(const H5T_t *dt, htri_t internal)
assert(dt);
- /* Lie to the user if they have a VL string and tell them it's in the string class */
- if(dt->shared->type==H5T_VLEN && dt->shared->u.vlen.type==H5T_VLEN_STRING)
- ret_value=H5T_STRING;
- else
- ret_value=dt->shared->type;
-
/* Externally, a VL string is a string; internally, a VL string is a VL. */
if(internal) {
ret_value=dt->shared->type;