[svn-r29331] Merge of r29150 from trunk

segfault on corrupted file fix

Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
           autotools serial

1 files changed, 3 insertions, 7 deletions

diff --git a/src/H5C.c b/src/H5C.c
index ae73259..211cf2d 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -3282,16 +3282,12 @@ H5C_protect(H5F_t *		f,
 
         hit = FALSE;
 
-        thing = H5C_load_entry(f, dxpl_id, 
+        if(NULL == (thing = H5C_load_entry(f, dxpl_id, 
 #ifdef H5_HAVE_PARALLEL
-                               coll_access, 
+                                           coll_access, 
 #endif /* H5_HAVE_PARALLEL */
-                               type, addr, udata);
-
-        if ( thing == NULL ) {
-
+                                           type, addr, udata)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "can't load entry")
-        }
 
         entry_ptr = (H5C_cache_entry_t *)thing;
         entry_ptr->ring  = ring;