summaryrefslogtreecommitdiffstats
path: root/tools/h5jam
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 /tools/h5jam
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 'tools/h5jam')
-rw-r--r--tools/h5jam/h5unjam.c59
1 files changed, 45 insertions, 14 deletions
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 3ab2202..5e4d864 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -28,10 +28,11 @@
#define TRUE 1
#define FALSE 0
+#define COPY_BUF_SIZE 1024
hsize_t write_pad( int , hsize_t );
hsize_t compute_pad( hsize_t );
-hsize_t copy_to_file( int , int , ssize_t, ssize_t );
+herr_t copy_to_file( int , int , ssize_t, ssize_t );
const char *progname = "h5unjam";
int d_status = EXIT_SUCCESS;
@@ -268,13 +269,19 @@ main(int argc, const char *argv[])
/* copy from 0 to 'usize - 1' into ufid */
if (!do_delete) {
- copy_to_file( ifid, ufid, 0, (ssize_t) usize);
+ if(copy_to_file(ifid, ufid, 0, (ssize_t) usize) < 0) {
+ error_msg(progname, "unable to copy user block to output file \"%s\"\n", ub_file);
+ exit(EXIT_FAILURE);
+ }
}
/* copy from usize to end of file into h5fid,
* starting at end of user block if present
*/
- copy_to_file( ifid, h5fid, (ssize_t) usize, (ssize_t)(fsize - (ssize_t)usize) );
+ if(copy_to_file(ifid, h5fid, (ssize_t) usize, (ssize_t)(fsize - (ssize_t)usize)) < 0) {
+ error_msg(progname, "unable to copy hdf5 data to output file \"%s\"\n", output_file);
+ exit(EXIT_FAILURE);
+ }
HDclose(ufid);
@@ -288,36 +295,60 @@ main(int argc, const char *argv[])
* Copy 'how_much' bytes from the input file to the output file,
* starting at byte 'where' in the input file.
*
- * Returns the size of the output file.
+ * Returns 0 on success, -1 on failure.
*/
-hsize_t
+herr_t
copy_to_file( int infid, int ofid, ssize_t where, ssize_t how_much )
{
- char buf[1024];
+ static char buf[COPY_BUF_SIZE];
off_t to;
off_t from;
ssize_t nchars = -1;
+ ssize_t wnchars = -1;
+ herr_t ret_value = 0;
/* nothing to copy */
if(how_much <= 0)
- return(where);
+ goto done;
from = where;
to = 0;
- while( how_much > 0) {
+ while(how_much > 0) {
+ /* Seek to correct position in input file */
HDlseek(infid,from,SEEK_SET);
- if (how_much > 512)
- nchars = HDread(infid,buf,(unsigned)512);
+
+ /* Read data to buffer */
+ if (how_much > COPY_BUF_SIZE)
+ nchars = HDread(infid,buf,(unsigned)COPY_BUF_SIZE);
else
nchars = HDread(infid,buf,(unsigned)how_much);
+ if(nchars < 0) {
+ ret_value = -1;
+ goto done;
+ } /* end if */
+
+ /* Seek to correct position in output file */
HDlseek(ofid,to,SEEK_SET);
- HDwrite(ofid,buf,(unsigned)nchars);
+
+ /* Update positions/size */
how_much -= nchars;
from += nchars;
to += nchars;
- }
- return (where + how_much);
-}
+ /* Write nchars bytes to output file */
+ wnchars = nchars;
+ while(nchars > 0) {
+ wnchars = HDwrite(ofid,buf,(unsigned)nchars);
+ if(wnchars < 0) {
+ ret_value = -1;
+ goto done;
+ } /* end if */
+ nchars -= wnchars;
+ } /* end while */
+ } /* end while */
+
+done:
+ return ret_value;
+} /* end copy_to_file */