summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-01-06 22:06:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-01-06 22:06:45 (GMT)
commit5dd77b99cb999cb5929b2d9ba5dfc65483d2ad1c (patch)
tree6f17ae7a7918ad791f5e5c1403cbc16ed7c63673 /src
parentd21a92b3eaca784fd9fb251c8d47ce312321ed1e (diff)
downloadhdf5-5dd77b99cb999cb5929b2d9ba5dfc65483d2ad1c.zip
hdf5-5dd77b99cb999cb5929b2d9ba5dfc65483d2ad1c.tar.gz
hdf5-5dd77b99cb999cb5929b2d9ba5dfc65483d2ad1c.tar.bz2
[svn-r28833] Description:
Bring r28832 from trunk to revise_chunks branch: Reset driver info message when superblock load fails. Tested on: MacOSX/64 10.11.2 (amazon) w/serial & parallel (h5committest not required on this branch)
Diffstat (limited to 'src')
-rw-r--r--src/H5Fsuper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index da3bf3d..3752be4 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -546,8 +546,10 @@ H5F__super_read(H5F_t *f, hid_t dxpl_id, hbool_t initial_read)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "driver info message not present")
/* Validate and decode driver information */
- if(H5FD_sb_load(f->shared->lf, drvinfo.name, drvinfo.buf) < 0)
+ if(H5FD_sb_load(f->shared->lf, drvinfo.name, drvinfo.buf) < 0) {
+ H5O_msg_reset(H5O_DRVINFO_ID, &drvinfo);
HGOTO_ERROR(H5E_FILE, H5E_CANTDECODE, FAIL, "unable to decode driver information")
+ } /* end if */
/* Reset driver info message */
H5O_msg_reset(H5O_DRVINFO_ID, &drvinfo);