summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-02-05 02:56:25 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-02-05 02:56:25 (GMT)
commitc462a2ec1f5af1f57935be0caa1209f0ae9d63c4 (patch)
treec97f69dfe164146a66a796ed5eec3e41dfec1ae8 /fortran/src
parent9cd44ec31a6d948d03366a3db06830d240e188e9 (diff)
downloadhdf5-c462a2ec1f5af1f57935be0caa1209f0ae9d63c4.zip
hdf5-c462a2ec1f5af1f57935be0caa1209f0ae9d63c4.tar.gz
hdf5-c462a2ec1f5af1f57935be0caa1209f0ae9d63c4.tar.bz2
[svn-r18212] Description:
Bring revisions from Coverity fixing branch to trunk: r18184: Fixed Coverity issue 373. Allocated memory freed in line 762 in case of error. r18185: Fixed Coverity issues 357 & 358. Added check for NULL pointer before use. r18186: Fix coverity item 65. Added code to h5unjam to correctly handle failures in read() and write, and also to correctly handle writes that write less than requested. r18187: Fix coverity items 115 and 116. Added code to H5Tenum.c to correctly close opened datatypes in case of failure. r18188: Fixed Coverity issue 46. Check that dataset->shared is not null when freeing memory after error. r18190: Fix coverity item 95. Added code to H5T_create_vlen to correctly close allocated datatype in case of failure. r18191: Fixed Coverity error 59. Checked sfirst for -1 value before use in line 10533. r18192: Fix Coverity items 121 and 28 Added Asserts: 121: assert that all dimensions of count have values greater than zero. 28: assert curr_span pointer is not null before dereference. Note: still need too add checks in hyperslab APIs that fail when count values are zero, and appropriate tests. r18194: Fixed Coverity issues 61 & 62. Checked variable snpoints for value < 0 in line 218. Tested on: Mac OS X/32 10.6.2 (amazon) w/debug & production (already daily tested on coverity branch)
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5Ef.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c
index e68c86c..c6d860c 100644
--- a/fortran/src/H5Ef.c
+++ b/fortran/src/H5Ef.c
@@ -128,10 +128,11 @@ nh5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen)
size_t c_namelen = (size_t)*namelen;
int_f ret_value = 0;
- if(c_namelen) {
- if(NULL == (c_name = (char *)HDmalloc(c_namelen + 1)))
- HGOTO_DONE(FAIL)
- } /* end if */
+ if(c_namelen > 0)
+ c_name = (char *)HDmalloc(c_namelen + 1);
+
+ if(!c_name)
+ HGOTO_DONE(FAIL)
/*
* Call H5Eget_major function.
@@ -166,10 +167,11 @@ nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen)
size_t c_namelen = (size_t)*namelen;
int_f ret_value = 0;
- if(c_namelen) {
- if(NULL == (c_name = (char *)HDmalloc(c_namelen + 1)))
- HGOTO_DONE(FAIL)
- } /* end if */
+ if(c_namelen > 0)
+ c_name = (char *)HDmalloc(c_namelen + 1);
+
+ if(!c_name)
+ HGOTO_DONE(FAIL)
/*
* Call H5Eget_minor function.