diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2020-08-05 01:43:37 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2020-08-05 01:43:37 (GMT) |
| commit | 7c3d4402d730789173e413b48951fede5f6932f3 (patch) | |
| tree | c3799dcb10c8eda9e577ffb3e961781b7c9a1bc0 /hl/src | |
| parent | ee6f7d1c96f2def94b96ebb5fdb34d592a80c8ad (diff) | |
| parent | f59bb712dec221a076728b6c582818bcf814d71a (diff) | |
| download | hdf5-7c3d4402d730789173e413b48951fede5f6932f3.zip hdf5-7c3d4402d730789173e413b48951fede5f6932f3.tar.gz hdf5-7c3d4402d730789173e413b48951fede5f6932f3.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'f59bb712dec221a076728b6c582818bcf814d71a': (55 commits)
Fixes indenting in tools test scripts
Minor normalizations with 1.12 branch
Fixed bad parens in H5trace.c
Minor normalizations with hdf5_1_10
Mingw copy disabled
Warnings reduction in tools
Correct reference file
Correct h5diff filenames
Fixed typos in error messages.
Updated the Java tests to deal with H5Sset_extent_none changes
Fixed additional typos in tselect.c comments.
Fixes typo in tselect.c
Updates H5Sset_extent_none() to set H5S_NULL
Only one line needed to compare
Revert err file
Minor normalization with 1.10 branch
Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)
revert error-stack enable
Minor normalization with 1.10.
Add release notes for tools
...
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5IM.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 2a7ed9b..6f7414b 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -274,7 +274,8 @@ herr_t H5IMget_image_info( hid_t loc_id, return -1; /* Try to find the attribute "INTERLACE_MODE" on the >>image<< dataset */ - has_attr = H5LT_find_attribute(did, "INTERLACE_MODE"); + if ((has_attr = H5LT_find_attribute(did, "INTERLACE_MODE")) < 0) + goto out; /* It exists, get it */ if(has_attr == 1) |