[svn-r22647] Description:

    Bring r22646 from trunk to 1.8 branch:

    Changes resulting from Klocwork static analysis tool, from Mark Miller
@ LLNL (miller86@llnl.gov).

Tested on:
    Mac OS X/64 10.7.4 (amazon) w/debug, C++ & FORTRAN, using gcc 4.7.x
    (too minor to require h5committest)

1 files changed, 19 insertions, 16 deletions

diff --git a/test/dtypes.c b/test/dtypes.c
index 17349b9..dca7eec 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -1127,10 +1127,8 @@ test_compound_5(void)
     }
 
     /* Free memory buffers */
-    if(buf)
-        HDfree(buf);
-    if(bkg)
-        HDfree(bkg);
+    HDfree(buf);
+    HDfree(bkg);
     return retval;
 }
 
@@ -4699,11 +4697,12 @@ test_bitfield_funcs(void)
 {
     hid_t		type=-1, ntype=-1, super=-1;
     int                 size;
-    char*               tag;
+    char*               tag=0;
     H5T_pad_t           inpad;
     H5T_cset_t          cset;
     H5T_str_t           strpad;
     herr_t              ret;
+    int                 retval=-1;
 
     TESTING("some type functions for bitfield");
 
@@ -4787,16 +4786,18 @@ test_bitfield_funcs(void)
         goto error;
     } /* end if */
 
-    H5Tclose(type);
-    H5Tclose(ntype);
-    PASSED();
-    reset_hdf5();
-    return 0;
+    retval = 0;
 
  error:
+
+    if (retval == -1) retval = 1;
+
+    HDfree(tag);
+    H5Tclose(ntype);
     H5Tclose(type);
+    if (retval == 0) PASSED();
     reset_hdf5();
-    return 1;
+    return retval;
 }
 
 
@@ -7050,11 +7051,13 @@ error:
  */
 int test_utf_ascii_conv(void)
 {
-    hid_t fid;
-    hid_t did;
-    hid_t utf8_vtid, ascii_vtid;
-    hid_t utf8_tid, ascii_tid;
-    hid_t sid;
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t utf8_vtid = -1;
+    hid_t ascii_vtid = -1;
+    hid_t utf8_tid = -1;
+    hid_t ascii_tid = -1;
+    hid_t sid = -1;
     const char *utf8_w = "foo!";
     char *ascii_r = NULL;
     const char *ascii_w = "bar!";