diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-06 21:19:57 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-06 21:19:57 (GMT) |
| commit | a976ea9f7774ad2f8b23ff5dc4a3b46469a383fb (patch) | |
| tree | 57021efe62c5ab852460eb710cca62c20d0885de /src/H5Doh.c | |
| parent | fc5fde7a686b3018abc07eb7136cf9b9181b0eb9 (diff) | |
| download | hdf5-a976ea9f7774ad2f8b23ff5dc4a3b46469a383fb.zip hdf5-a976ea9f7774ad2f8b23ff5dc4a3b46469a383fb.tar.gz hdf5-a976ea9f7774ad2f8b23ff5dc4a3b46469a383fb.tar.bz2 | |
[svn-r18388] Description:
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/H5Doh.c')
| -rw-r--r-- | src/H5Doh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Doh.c b/src/H5Doh.c index 98e9bf3..8ed6644 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -423,11 +423,11 @@ H5O_dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) done: /* Free messages, if they've been read in */ if(layout_read && H5O_msg_reset(H5O_LAYOUT_ID, &layout) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset data storage layout message") + HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset data storage layout message") if(pline_read && H5O_msg_reset(H5O_PLINE_ID, &pline) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset I/O pipeline message") + HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset I/O pipeline message") if(efl_read && H5O_msg_reset(H5O_EFL_ID, &efl) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset external file list message") + HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, FAIL, "unable to reset external file list message") FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_dset_bh_info() */ |