summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5Fsuper.c')
-rw-r--r--src/H5Fsuper.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 3001644..4df0064 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -377,7 +377,10 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
/* Try detecting file's siganture */
/* (Don't leave before Bcast, to avoid hang on error) */
- H5E_BEGIN_TRY { status = H5FD_locate_signature(file, &super_addr); }
+ H5E_BEGIN_TRY
+ {
+ status = H5FD_locate_signature(file, &super_addr);
+ }
H5E_END_TRY;
/* Set superblock address to undefined on error */
@@ -1040,7 +1043,7 @@ done:
HDONE_ERROR(H5E_FILE, H5E_CANTUNPIN, FAIL, "unable to unpin driver info")
/* Evict the driver info block from the cache */
- if (H5AC_expunge_entry(f, H5AC_DRVRINFO, sblock->driver_addr, H5AC__NO_FLAGS_SET) < 0)
+ if (sblock && H5AC_expunge_entry(f, H5AC_DRVRINFO, sblock->driver_addr, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_FILE, H5E_CANTEXPUNGE, FAIL, "unable to expunge driver info block")
} /* end if */