diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-07-26 14:54:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-07-26 14:54:24 (GMT) |
| commit | dd51a8c0ad312ae7510fc2da0a757f6cf13658ae (patch) | |
| tree | a12ebc4363f7751631319cc6e800ee98b2f8311f /tools/lib | |
| parent | 749d0d83415ace804dc686157c6e4242c716808d (diff) | |
| download | hdf5-dd51a8c0ad312ae7510fc2da0a757f6cf13658ae.zip hdf5-dd51a8c0ad312ae7510fc2da0a757f6cf13658ae.tar.gz hdf5-dd51a8c0ad312ae7510fc2da0a757f6cf13658ae.tar.bz2 | |
HDFFV-10246 Fix vl string compare
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff_array.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 1b17382..6480cf6 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -674,21 +674,33 @@ static hsize_t diff_datum(void *_mem1, h5difftrace("diff_datum H5T_STRING variable\n"); /* Get pointer to first string */ s1 = *(char**) mem1; - size1 = HDstrlen(s1); + if(s1) + size1 = HDstrlen(s1); + else + size1 = 0; /* Get pointer to second string */ s2 = *(char**) mem2; - size2 = HDstrlen(s2); + if(s2) + size2 = HDstrlen(s2); + else + size2 = 0; } else if (H5T_STR_NULLTERM == pad) { h5difftrace("diff_datum H5T_STRING null term\n"); /* Get pointer to first string */ s1 = (char*) mem1; - size1 = HDstrlen(s1); + if(s1) + size1 = HDstrlen(s1); + else + size1 = 0; if (size1 > size_mtype) size1 = size_mtype; /* Get pointer to second string */ s2 = (char*) mem2; - size2 = HDstrlen(s2); + if(s2) + size2 = HDstrlen(s2); + else + size2 = 0; if (size2 > size_mtype) size2 = size_mtype; } |