summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-01-06 22:05:32 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-01-06 22:05:32 (GMT)
commitdc63336a4a863f1222f698d882e0862b72aa93fc (patch)
tree02ea5b51e2a27b10ac037cca7170c41492b85069
parente9a63d30df37fba8b879f18f39cf96b3d46bd615 (diff)
downloadhdf5-dc63336a4a863f1222f698d882e0862b72aa93fc.zip
hdf5-dc63336a4a863f1222f698d882e0862b72aa93fc.tar.gz
hdf5-dc63336a4a863f1222f698d882e0862b72aa93fc.tar.bz2
[svn-r28832] Description:
Reset driver info message when superblock load fails. Tested on: MacOSX/64 10.11.2 (amazon) w/serial & parallel Linux/32 2.6.x (jam) w/serial Linux/64 2.6.x (mayll) w/serial
-rw-r--r--src/H5Fsuper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index a0f9536..332dfa6 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -510,8 +510,10 @@ H5F__super_read(H5F_t *f, hid_t dxpl_id)
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);