TRILAB-82 fix coverity high-impact issues

7 files changed, 130 insertions, 121 deletions

diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index e399d8f..ec76511 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -3438,8 +3438,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\"");
             for (i = 0; i < sz; i++) {
-                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf);
-                buf = (char *) buf + sizeof(unsigned int);
+                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf + (i * sizeof(unsigned int)));
             }
             h5tools_str_append(&buffer, "\"");
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 3b64a0e..16c0d8c 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -88,6 +88,7 @@ int main(int argc, char *argv[])
     const char     *err7 = "Invalid type of data - %s.\n";
     const char     *err8 = "Invalid size of data - %s.\n";
     const char     *err9 = "Cannot specify more than 30 input files in one call to h5import.\n";
+    const char     *err10 = "Length of output file name limited to 255 chars.\n";
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -98,6 +99,9 @@ int main(int argc, char *argv[])
     (void) HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
     (void) HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
+    /* Initialize the file structure to 0 */
+    HDmemset(&opt, 0, sizeof(struct Options));
+
     if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
         HDexit(EXIT_SUCCESS);
@@ -112,9 +116,6 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    /* Initialize the file structure to 0 */
-    HDmemset(&opt, 0, sizeof(struct Options));
-
     /*
      * parse the command line
      */
@@ -155,6 +156,10 @@ int main(int argc, char *argv[])
             break;
 
         case 5: /* get outfile found */
+            if (HDstrlen(argv[i]) > MAX_PATH_NAME_LENGTH) {
+                (void) HDfprintf(stderr, err10, argv[i]);
+                goto err;
+            }
             (void) HDstrcpy(opt.outfile, argv[i]);
             outfile_named = TRUE;
             break;
@@ -1366,9 +1371,9 @@ static int allocateFloatStorage(struct Input *in)
 static int processConfigurationFile(char *infile, struct Input *in)
 {
     FILE       *strm = NULL;
-    char        key[255];
+    char        key[MAX_PATH_NAME_LENGTH];
     int         kindex;
-    char        temp[255];
+    char        temp[MAX_PATH_NAME_LENGTH];
     int         ival;
     int         scanret;
     int         retval = -1;
@@ -1446,16 +1451,16 @@ static int processConfigurationFile(char *infile, struct Input *in)
         goto error;
     }
 
-    scanret = fscanf(strm, "%s", key);
+    scanret = fscanf(strm, "%254s", key);
     if((scanret == 1) && !HDstrcmp("HDF5", key)) {
 #ifdef H5DEBUGIMPORT
         int pndx;
         HDprintf("\nh5dump file\n");
 #endif
         in->h5dumpInput = 1;
-        scanret = fscanf(strm, "%s", temp); /* filename */
-        scanret = fscanf(strm, "%s", temp); /* start bracket */
-        scanret = fscanf(strm, "%s", key); /* DATASET */
+        scanret = fscanf(strm, "%254s", temp); /* filename */
+        scanret = fscanf(strm, "%254s", temp); /* start bracket */
+        scanret = fscanf(strm, "%254s", key); /* DATASET */
         while (scanret == 1) {
             if(!HDstrcmp("DATASET", key)) { /* PATH */
 #ifdef H5DEBUGIMPORT
@@ -1465,7 +1470,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err3a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1477,7 +1482,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
                 in->configOptionVector[PATH] = 1;
-                scanret = fscanf(strm, "%s", temp); /* start bracket */
+                scanret = fscanf(strm, "%254s", temp); /* start bracket */
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump DATASET %s found\n", temp);
 #endif
@@ -1491,7 +1496,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
 
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1528,20 +1533,20 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATATYPE STRING found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* string properties */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* string properties */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
                     while (get_next_prop) {
                         if(!HDstrcmp("STRSIZE", temp)) { /* STRSIZE */
-                            if (fscanf(strm, "%s", temp) != 1) {
+                            if (fscanf(strm, "%254s", temp) != 1) {
                                 (void) HDfprintf(stderr, "%s", err19);
                                 goto error;
                             }
@@ -1561,7 +1566,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             }
                         }
                         else if(!HDstrcmp("STRPAD", temp)) { /* STRPAD */
-                            if (fscanf(strm, "%s", temp) != 1) { /* STRPAD type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* STRPAD type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1570,7 +1575,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                         }
                         else if(!HDstrcmp("CSET", key)) { /* CSET */
-                            if (fscanf(strm, "%s", temp) != 1) { /* CSET type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CSET type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1580,7 +1585,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 
                         }
                         else if(!HDstrcmp("CTYPE", temp)) { /* CTYPE */
-                            if (fscanf(strm, "%s", temp) != 1) { /* CTYPE type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CTYPE type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1588,7 +1593,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             HDprintf("h5dump DATATYPE STRING  CTYPE %s found\n", temp);
 #endif
                         } /* if(!HDstrcmp("CSET", key)) */
-                        if (fscanf(strm, "%s", temp) != 1) {
+                        if (fscanf(strm, "%254s", temp) != 1) {
                             (void) HDfprintf(stderr, "%s", err18);
                             goto error;
                         }
@@ -1607,7 +1612,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump DATASPACE key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1623,14 +1628,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATASPACE SIMPLE found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1641,7 +1646,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         int get_next_dim = 1;
                         int i = 0;
 
-                        if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1651,7 +1656,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more = temp;
                             temp_dims[icount] = HDstrtoull(more, &more, 10);
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void) HDfprintf(stderr, err6b, infile);
                                 goto error;
                             }
@@ -1694,7 +1699,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1705,7 +1710,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         if ((in->maxsizeOfDimension = (hsize_t *) HDmalloc ((size_t) in->rank * sizeof(hsize_t))) == NULL) {
                             goto error;
                         }
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -1719,7 +1724,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                             HDprintf("h5dump DATASPACE SIMPLE process max dim values\n");
 #endif
-                            if (fscanf(strm, "%s", temp) != 1) { /* max dim with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -1738,7 +1743,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                     char *more = temp;
                                     in->maxsizeOfDimension[i] = HDstrtoull(more, &more, 10);
                                 }
-                                if (fscanf(strm, "%s", temp) != 1) { /* max dim or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */
                                     (void) HDfprintf(stderr, err16c, infile);
                                     goto error;
                                 }
@@ -1750,7 +1755,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* comma */
                                     i++;
-                                    if (i > MAX_NUM_DIMENSION) {
+                                    if (i >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
@@ -1769,7 +1774,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
-                        scanret = fscanf(strm, "%s", temp); /* end bracket */
+                        scanret = fscanf(strm, "%254s", temp); /* end bracket */
 #ifdef H5DEBUGIMPORT
                         HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
@@ -1784,14 +1789,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump STORAGE_LAYOUT key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* CHUNKED */
+                if (fscanf(strm, "%254s", temp) != 1) { /* CHUNKED */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
@@ -1803,7 +1808,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, "Unable to allocate dynamic memory.\n");
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1814,7 +1819,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         int get_next_dim = 1;
                         int icount = 0;
 
-                        if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1824,7 +1829,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more = temp;
                             in->sizeOfChunk[icount] = HDstrtoull(more, &more, 10);
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void) HDfprintf(stderr, err6b, infile);
                                 goto error;
                             }
@@ -1856,7 +1861,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) { /* SIZE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* SIZE */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1873,7 +1878,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                     }
                     while (HDstrcmp("}", temp)) {
-                        if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                             (void) HDfprintf(stderr, "%s", err18);
                             goto error;
                         }
@@ -1888,14 +1893,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump FILTERS key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump FILTERS %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
@@ -1906,21 +1911,21 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* DEFLATE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* DEFLATE */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* bgin bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* bgin bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* LEVEL */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* LEVEL */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1935,7 +1940,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     HDprintf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival);
 #endif
                     in->compressionParam = ival;
-                    if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1957,7 +1962,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
-                if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1971,14 +1976,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump SUBSET key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err20, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump SUBSET %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* SUBSET keyword */
+                if (fscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1988,7 +1993,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 while (get_next_prop) {
                     if(!HDstrcmp("COUNT", temp)) { /* COUNT */
                         int icount = 0;
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -1999,7 +2004,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             int get_next_dim = 1;
                             int i = 0;
 
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2009,7 +2014,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
-                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void) HDfprintf(stderr, err6b, infile);
                                     goto error;
                                 }
@@ -2023,7 +2028,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* Dimension */
                                     icount++;
-                                    if (icount > MAX_NUM_DIMENSION) {
+                                    if (icount >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
@@ -2044,7 +2049,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     } /* if(!HDstrcmp("COUNT", temp))  COUNT */
                     if(!HDstrcmp("BLOCK", temp)) { /* BLOCK */
                         int icount = 0;
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -2055,7 +2060,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             int get_next_dim = 1;
                             int i = 0;
 
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2065,7 +2070,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
-                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void) HDfprintf(stderr, err6b, infile);
                                     goto error;
                                 }
@@ -2098,7 +2103,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             in->configOptionVector[DIM] = 1;
                         } /* if(!HDstrcmp("(", key))  start paren */
                     } /* if(!HDstrcmp("BLOCK", temp))  BLOCK */
-                    if (fscanf(strm, "%s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -2117,7 +2122,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 scanret = 0;
                 break;
             }
-            scanret = fscanf(strm, "%s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 #ifdef H5DEBUGIMPORT
         HDprintf("h5dump path");
@@ -2158,7 +2163,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err3a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -2175,7 +2180,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
 
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -2203,7 +2208,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err5a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%d", (&ival)) != 1) {
+                if (fscanf(strm, "%254d", (&ival)) != 1) {
                     (void) HDfprintf(stderr, "%s", err19);
                     goto error;
                 }
@@ -2400,7 +2405,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
             default:
                 break;
             }
-            scanret = fscanf(strm, "%s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 
         /*
@@ -2571,7 +2576,7 @@ static int getOutputClass(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output class.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3464,7 +3469,7 @@ static int getInputByteOrder(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for input byte-order.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3595,7 +3600,7 @@ static int getOutputArchitecture(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output architecture.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3627,7 +3632,7 @@ static int getOutputByteOrder(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output byte-order.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3658,7 +3663,7 @@ static int getCompressionType(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for compression.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3722,7 +3727,7 @@ static int getExternalFilename(struct Input *in, FILE *strm)
     char        temp[255];
     const char *err1 = "Unable to get 'string' value.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
diff --git a/tools/src/h5import/h5import.h b/tools/src/h5import/h5import.h
index c55717d..00c41f6 100644
--- a/tools/src/h5import/h5import.h
+++ b/tools/src/h5import/h5import.h
@@ -102,8 +102,8 @@ struct Input
 
 struct infilesformat
 {
-    char datafile[255];
-    char configfile[255];
+    char datafile[MAX_PATH_NAME_LENGTH];
+    char configfile[MAX_PATH_NAME_LENGTH];
     struct Input in;
     int config; /* Configfile present? No - 0. Yes - 1 */
 };
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index b279cf9..0567269 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -1422,9 +1422,9 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size)
     } /* end while */
 
 done:
-    if (infid > 0)
+    if (infid >= 0)
         HDclose(infid);
-    if (outfid > 0)
+    if (outfid >= 0)
         HDclose(outfid);
 
     return ret_value;
@@ -1497,7 +1497,7 @@ print_user_block(const char *filename, hid_t fid)
     }
 
 done:
-    if (fh > 0)
+    if (fh >= 0)
         HDclose(fh);
 
     return;
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 8f0178f..dec25f9 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -707,6 +707,8 @@ int main(int argc, const char **argv)
     void               *edata;
     void               *tools_edata;
 
+    HDmemset(&options, 0, sizeof(pack_opt_t));
+
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index dc1dc4a..8109b93 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -74,7 +74,7 @@ typedef struct iter_t {
     ohdr_info_t group_ohdr_info;        /* Object header information for groups */
 
     hsize_t  max_attrs;                 /* Maximum attributes from a group */
-    unsigned long *num_small_attrs;        /* Size of small attributes tracked */
+    unsigned long *num_small_attrs;    	/* Size of small attributes tracked */
     unsigned attr_nbins;                /* Number of bins for attribute counts */
     unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
 
@@ -257,7 +257,7 @@ leave(int ret)
 }
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -297,7 +297,7 @@ static void usage(const char *prog)
      HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function: ceil_log10
  *
@@ -324,7 +324,7 @@ ceil_log10(unsigned long x)
     return ret;
 } /* ceil_log10() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: attribute_stats
  *
@@ -374,7 +374,7 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
      return 0;
 } /* end attribute_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: group_stats
  *
@@ -456,7 +456,7 @@ done:
     return ret_value;
 } /* end group_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: dataset_stats
  *
@@ -648,7 +648,7 @@ done:
      return ret_value;
 }  /* end dataset_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: datatype_stats
  *
@@ -680,7 +680,7 @@ done:
      return ret_value;
 }  /* end datatype_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: obj_stats
  *
@@ -736,7 +736,7 @@ done:
     return ret_value;
 } /* end obj_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: lnk_stats
  *
@@ -834,7 +834,7 @@ freespace_stats(hid_t fid, iter_t *iter)
     return 0;
 } /* end freespace_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: hand_free
  *
@@ -863,7 +863,7 @@ hand_free(struct handler_t *hand)
     } /* end if */
 } /* end hand_free() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
@@ -1041,7 +1041,7 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function: iter_free
  *
@@ -1106,7 +1106,7 @@ iter_free(iter_t *iter)
     } /* end if */
 } /* end iter_free() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_info
  *
@@ -1138,7 +1138,7 @@ print_file_info(const iter_t *iter)
     return 0;
 } /* print_file_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_metadata
  *
@@ -1198,7 +1198,7 @@ print_file_metadata(const iter_t *iter)
     return 0;
 } /* print_file_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_group_info
  *
@@ -1255,7 +1255,7 @@ print_group_info(const iter_t *iter)
     return 0;
 } /* print_group_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_group_metadata
  *
@@ -1282,7 +1282,7 @@ print_group_metadata(const iter_t *iter)
     return 0;
 } /* print_group_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dataset_info
  *
@@ -1369,7 +1369,7 @@ print_dataset_info(const iter_t *iter)
     return 0;
 } /* print_dataset_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dataset_metadata
  *
@@ -1398,7 +1398,7 @@ print_dset_metadata(const iter_t *iter)
     return 0;
 } /* print_dset_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dset_dtype_meta
  *
@@ -1439,7 +1439,7 @@ print_dset_dtype_meta(const iter_t *iter)
     return 0;
 } /* print_dset_dtype_meta() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_attr_info
  *
@@ -1488,7 +1488,7 @@ print_attr_info(const iter_t *iter)
     return 0;
 } /* print_attr_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_freespace_info
  *
@@ -1538,7 +1538,7 @@ print_freespace_info(const iter_t *iter)
     return 0;
 } /* print_freespace_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_storage_summary
  *
@@ -1602,7 +1602,7 @@ print_storage_summary(const iter_t *iter)
     return 0;
 } /* print_storage_summary() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_statistics
  *
@@ -1649,7 +1649,7 @@ print_file_statistics(const iter_t *iter)
     if(display_summary)         print_storage_summary(iter);
 } /* print_file_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_object_statistics
  *
@@ -1672,7 +1672,7 @@ print_object_statistics(const char *name)
     printf("Object name %s\n", name);
 } /* print_object_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_statistics
  *
@@ -1698,7 +1698,7 @@ print_statistics(const char *name, const iter_t *iter)
         print_file_statistics(iter);
 } /* print_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -1780,15 +1780,15 @@ main(int argc, const char *argv[])
             iter.free_hdr = finfo.free.meta_size;
         } /* end else */
 
-    iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-    iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
-    iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
+        iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
+        iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+        iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
 
-    if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
-        error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
-            h5tools_setstatus(EXIT_FAILURE);
-        goto done;
-    }
+        if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+            error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
+                h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+        }
 
         if((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 5724e1b..42dda92 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -170,9 +170,12 @@ parse_command_line(int argc, const char **argv)
 
             case 'i':
                 increment_eoa_eof = TRUE;
-                if(opt_arg != NULL && (increment = HDatoi(opt_arg)) < 0) {
-                    usage(h5tools_getprogname());
-                    goto done;
+                if(opt_arg != NULL) {
+                    if (HDatoi(opt_arg) < 0) {
+                        usage(h5tools_getprogname());
+                        goto done;
+                    }
+                    increment = HDatoi(opt_arg);
                 }
                 break;
 
@@ -231,14 +234,14 @@ leave(int ret)
  *          so the file is opened with write access.
  *          The --filesize option just prints the EOA and EOF, so the file
  *          is opened with read access.
- *      
+ *
  *          The -s option will activate the private property:
- *              --H5F_ACS_CLEAR_STATUS_FLAGS_NAME         
+ *              --H5F_ACS_CLEAR_STATUS_FLAGS_NAME
  *          The --increment option will active these two private properties:
- *              --H5F_ACS_NULL_FSM_ADDR_NAME              
- *              --H5F_ACS_SKIP_EOF_CHECK_NAME            
+ *              --H5F_ACS_NULL_FSM_ADDR_NAME
+ *              --H5F_ACS_SKIP_EOF_CHECK_NAME
  *          The --filesize will activate the private property:
- *              --H5F_ACS_SKIP_EOF_CHECK_NAME            
+ *              --H5F_ACS_SKIP_EOF_CHECK_NAME
  *
  * Return:      Success: 0
  *              Failure: 1
@@ -280,7 +283,7 @@ main (int argc, const char *argv[])
     }
 
     /* Cannot combine the --filesize option with other options */
-    if(print_filesize && 
+    if(print_filesize &&
        (clear_status_flags || remove_cache_image || increment_eoa_eof)) {
         error_msg("Cannot combine --filesize with other options\n");
         h5tools_setstatus(EXIT_FAILURE);
@@ -298,7 +301,7 @@ main (int argc, const char *argv[])
      }
 
     /* -s option */
-    if(clear_status_flags) { 
+    if(clear_status_flags) {
         /* Set to clear the status_flags in the file's superblock */
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_CLEAR_STATUS_FLAGS_NAME, &clear_status_flags) < 0) {
@@ -309,7 +312,7 @@ main (int argc, const char *argv[])
     }
 
     /* --increment option */
-    if(increment_eoa_eof) { 
+    if(increment_eoa_eof) {
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_SKIP_EOF_CHECK_NAME, &increment_eoa_eof) < 0) {
             error_msg("H5Pset\n");
@@ -325,7 +328,7 @@ main (int argc, const char *argv[])
     }
 
     /* --filesize option; open the file read-only */
-    if(print_filesize) { 
+    if(print_filesize) {
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_SKIP_EOF_CHECK_NAME, &print_filesize) < 0) {
             error_msg("H5Pset\n");
@@ -333,7 +336,7 @@ main (int argc, const char *argv[])
             goto done;
         }
         flags = H5F_ACC_RDONLY;
-    } 
+    }
 
     /* Open the file */
     if((fid = h5tools_fopen(fname, flags, fapl, NULL, NULL, (size_t)0)) < 0) {
@@ -367,7 +370,7 @@ main (int argc, const char *argv[])
     }
 
     /* -m option */
-    if(remove_cache_image) { 
+    if(remove_cache_image) {
         if(H5Fget_mdc_image_info(fid, &image_addr, &image_len) < 0) {
             error_msg("H5Fget_mdc_image_info\n");
             h5tools_setstatus(EXIT_FAILURE);
@@ -375,7 +378,7 @@ main (int argc, const char *argv[])
         }
         if(image_addr == HADDR_UNDEF && image_len == 0)
             warn_msg("No cache image in the file\n");
-    } 
+    }
 
 
     h5tools_setstatus(EXIT_SUCCESS);