summaryrefslogtreecommitdiffstats
path: root/src/H5HFhdr.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-03-06 21:24:31 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-03-06 21:24:31 (GMT)
commit9211b9e5b6f158310ffbe0942a3d254ccafc9693 (patch)
treec0b6ac392ec67d3394d36898de7d66e81ebbd621 /src/H5HFhdr.c
parent8b3a2b480b412ebb04997d57343fc0733906afe6 (diff)
downloadhdf5-9211b9e5b6f158310ffbe0942a3d254ccafc9693.zip
hdf5-9211b9e5b6f158310ffbe0942a3d254ccafc9693.tar.gz
hdf5-9211b9e5b6f158310ffbe0942a3d254ccafc9693.tar.bz2
[svn-r18389] Description:
Bring r18388 from trunk back to 1.8 branch: Bring changes from Coverity session from branch into trunk: r18378: Fixed coverity issues 207 and 322. Pointer hdr was checked for NULL after being asserted and dereferenced. Check was removed. r18379: Fix coverity issues # 88 and # 435. r18380: Fixed Coverity issue # 85. Added check of returned pointer for NULL before use. r18381: Resolve coverity issues # 214 and # 215 r18382: Issue 131: Add null checks to allocations and check for free in error handling r18383: Issue 421: Reorganized code to make intention clearer. Also, set local variable fl to NULL after transfer to tail. Heap->freelist will take care of all allocations r18384: Coverity #249 and #250 - STRING_ATT_CHECK wasn't allocated before being used and freed in function test_write_vl_string_attribute and test_read_vl_string_attribute. Tested on: Mac OS X/32 10.6.2 (amazon) w/debug & prod (h5committested in daily tests)
Diffstat (limited to 'src/H5HFhdr.c')
-rw-r--r--src/H5HFhdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 8652f90..e55f472 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -1454,7 +1454,7 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
done:
/* Unprotect the header with appropriate flags */
- if(hdr && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
+ if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
FUNC_LEAVE_NOAPI(ret_value)