diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-05-16 14:28:49 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-05-16 14:28:49 (GMT) |
commit | 4f0b92bdd5d35395b3ee0d90a84133032b85e8ff (patch) | |
tree | 20c448e7d3eddc6ddc303d24c23a4872a4905d35 /tools/lib/h5diff_array.c | |
parent | 3e1a06e6494c9dd9a6f4b39e702949159e803283 (diff) | |
download | hdf5-4f0b92bdd5d35395b3ee0d90a84133032b85e8ff.zip hdf5-4f0b92bdd5d35395b3ee0d90a84133032b85e8ff.tar.gz hdf5-4f0b92bdd5d35395b3ee0d90a84133032b85e8ff.tar.bz2 |
HDFFV-10128 Fixed string length with no null fixed
Diffstat (limited to 'tools/lib/h5diff_array.c')
-rw-r--r-- | tools/lib/h5diff_array.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 0a9d18a..499d5eb 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -665,6 +665,7 @@ static hsize_t diff_datum(void *_mem1, size_t size1; size_t size2; size_t sizex; + size_t size_mtype = H5Tget_size(m_type); H5T_str_t pad = H5Tget_strpad(m_type); /* if variable length string */ @@ -682,17 +683,21 @@ static hsize_t diff_datum(void *_mem1, /* Get pointer to first string */ s1 = (char*) mem1; size1 = HDstrlen(s1); + if (size1 > size_mtype) + size1 = size_mtype; /* Get pointer to second string */ s2 = (char*) mem2; size2 = HDstrlen(s2); + if (size2 > size_mtype) + size2 = size_mtype; } else { /* Get pointer to first string */ s1 = (char *)mem1; - size1 = H5Tget_size(m_type); + size1 = size_mtype; /* Get pointer to second string */ s2 = (char *)mem2; - size2 = H5Tget_size(m_type); + size2 = size_mtype; } /* |