diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 22:24:20 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 22:24:20 (GMT) |
| commit | 1fde26b7a5447089ac57b2ffc10f2b535b7999de (patch) | |
| tree | d6663401ce4b73e4a242d92fce0d25e7dd303a13 /tools/lib/h5diff_attr.c | |
| parent | c7fe0c67adc04b108204af25c60449352b3a8e6b (diff) | |
| download | hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.zip hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.tar.gz hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.tar.bz2 | |
[svn-r21660] Purpose:
HDFFV-7770 - h5diff segmentation fault on JPSS files
Description:
Fixed segfault over non-comparable attribute with different dimention or
rank, along with '-c' option to display details.
Merged from HDF5 trunk r21658.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows, Cmake
Diffstat (limited to 'tools/lib/h5diff_attr.c')
| -rw-r--r-- | tools/lib/h5diff_attr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index d9132e9..85cd01f 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -380,8 +380,10 @@ hsize_t diff_attr(hid_t loc1_id, *---------------------------------------------------------------------- */ + /* pass dims1 and dims2 for maxdims as well since attribute's maxdims + * are always same */ if( diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2, - NULL, NULL, name1, name2, options, 0) != 1 ) + dims1, dims2, name1, name2, options, 0) != 1 ) { if(H5Tclose(ftype1_id) < 0) goto error; |