[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)

5 files changed, 91 insertions, 74 deletions

diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index a4f7d8e..668bce4 100644
--- a/src/H5B2hdr.c
+++ b/src/H5B2hdr.c
@@ -599,7 +599,7 @@ H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
 
 done:
     /* Unprotect the header with appropriate flags */
-    if(hdr && H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
+    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header")
 
     FUNC_LEAVE_NOAPI(SUCCEED)
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() */
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 8652f90..e55f472 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -1454,7 +1454,7 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
 
 done:
     /* Unprotect the header with appropriate flags */
-    if(hdr && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
+    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, hdr, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index 6064fe5..47d5d6f 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -173,12 +173,12 @@ H5HL_fl_deserialize(H5HL_t *heap, hsize_t free_block)
         if(fl->offset + fl->size > heap->dblk_size)
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "bad heap free list")
 
-        /* Insert node into list */
+        /* Append node onto list */
         if(tail)
             tail->next = fl;
-        tail = fl;
-        if(!heap->freelist)
+        else
             heap->freelist = fl;
+        tail = fl;
         fl = NULL;
     } /* end while */
 
diff --git a/src/H5trace.c b/src/H5trace.c
index b554b80..8c83505 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -916,172 +916,189 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 	    break;
 
 	case 'i':
-	    if (ptr) {
-		if (vp) {
-		    fprintf (out, "0x%lx", (unsigned long)vp);
-		} else {
+	    if(ptr) {
+		if(vp)
+		    fprintf(out, "0x%lx", (unsigned long)vp);
+		else
 		    fprintf(out, "NULL");
-		}
-	    } else {
+	    } /* end if */
+            else {
 		hid_t obj = va_arg (ap, hid_t);
-		if (H5P_DEFAULT == obj) {
-		    fprintf (out, "H5P_DEFAULT");
-		} else if (obj<0) {
-		    fprintf (out, "FAIL");
-		} else {
-		    switch (H5I_TYPE(obj)) { /* Use internal H5I macro instead of function call */
+
+		if(H5P_DEFAULT == obj)
+		    fprintf(out, "H5P_DEFAULT");
+		else if(obj < 0)
+		    fprintf(out, "FAIL");
+		else {
+		    switch(H5I_TYPE(obj)) { /* Use internal H5I macro instead of function call */
                         case H5I_UNINIT:
-                            fprintf (out, "%ld (uninit - error)", (long)obj);
+                            fprintf(out, "%ld (uninit - error)", (long)obj);
                             break;
+
                         case H5I_BADID:
-                            fprintf (out, "%ld (error)", (long)obj);
+                            fprintf(out, "%ld (error)", (long)obj);
                             break;
+
                         case H5I_FILE:
                             fprintf(out, "%ld (file)", (long)obj);
                             break;
+
                         case H5I_GROUP:
                             fprintf(out, "%ld (group)", (long)obj);
                             break;
+
                         case H5I_DATATYPE:
-                            if (obj==H5T_NATIVE_SCHAR_g) {
+                            if(obj == H5T_NATIVE_SCHAR_g)
                                 fprintf(out, "H5T_NATIVE_SCHAR");
-                            } else if (obj==H5T_NATIVE_UCHAR_g) {
+                            else if(obj == H5T_NATIVE_UCHAR_g)
                                 fprintf(out, "H5T_NATIVE_UCHAR");
-                            } else if (obj==H5T_NATIVE_SHORT_g) {
+                            else if(obj == H5T_NATIVE_SHORT_g)
                                 fprintf(out, "H5T_NATIVE_SHORT");
-                            } else if (obj==H5T_NATIVE_USHORT_g) {
+                            else if(obj == H5T_NATIVE_USHORT_g)
                                 fprintf(out, "H5T_NATIVE_USHORT");
-                            } else if (obj==H5T_NATIVE_INT_g) {
+                            else if(obj == H5T_NATIVE_INT_g)
                                 fprintf(out, "H5T_NATIVE_INT");
-                            } else if (obj==H5T_NATIVE_UINT_g) {
+                            else if(obj == H5T_NATIVE_UINT_g)
                                 fprintf(out, "H5T_NATIVE_UINT");
-                            } else if (obj==H5T_NATIVE_LONG_g) {
+                            else if(obj == H5T_NATIVE_LONG_g)
                                 fprintf(out, "H5T_NATIVE_LONG");
-                            } else if (obj==H5T_NATIVE_ULONG_g) {
+                            else if(obj == H5T_NATIVE_ULONG_g)
                                 fprintf(out, "H5T_NATIVE_ULONG");
-                            } else if (obj==H5T_NATIVE_LLONG_g) {
+                            else if(obj == H5T_NATIVE_LLONG_g)
                                 fprintf(out, "H5T_NATIVE_LLONG");
-                            } else if (obj==H5T_NATIVE_ULLONG_g) {
+                            else if(obj == H5T_NATIVE_ULLONG_g)
                                 fprintf(out, "H5T_NATIVE_ULLONG");
-                            } else if (obj==H5T_NATIVE_FLOAT_g) {
+                            else if(obj == H5T_NATIVE_FLOAT_g)
                                 fprintf(out, "H5T_NATIVE_FLOAT");
-                            } else if (obj==H5T_NATIVE_DOUBLE_g) {
+                            else if(obj == H5T_NATIVE_DOUBLE_g)
                                 fprintf(out, "H5T_NATIVE_DOUBLE");
 #if H5_SIZEOF_LONG_DOUBLE !=0
-                            } else if (obj==H5T_NATIVE_LDOUBLE_g) {
+                            else if(obj == H5T_NATIVE_LDOUBLE_g)
                                 fprintf(out, "H5T_NATIVE_LDOUBLE");
 #endif
-                            } else if (obj==H5T_IEEE_F32BE_g) {
+                            else if(obj == H5T_IEEE_F32BE_g)
                                 fprintf(out, "H5T_IEEE_F32BE");
-                            } else if (obj==H5T_IEEE_F32LE_g) {
+                            else if(obj == H5T_IEEE_F32LE_g)
                                 fprintf(out, "H5T_IEEE_F32LE");
-                            } else if (obj==H5T_IEEE_F64BE_g) {
+                            else if(obj == H5T_IEEE_F64BE_g)
                                 fprintf(out, "H5T_IEEE_F64BE");
-                            } else if (obj==H5T_IEEE_F64LE_g) {
+                            else if(obj == H5T_IEEE_F64LE_g)
                                 fprintf(out, "H5T_IEEE_F64LE");
-                            } else if (obj==H5T_STD_I8BE_g) {
+                            else if(obj == H5T_STD_I8BE_g)
                                 fprintf(out, "H5T_STD_I8BE");
-                            } else if (obj==H5T_STD_I8LE_g) {
+                            else if(obj == H5T_STD_I8LE_g)
                                 fprintf(out, "H5T_STD_I8LE");
-                            } else if (obj==H5T_STD_I16BE_g) {
+                            else if(obj == H5T_STD_I16BE_g)
                                 fprintf(out, "H5T_STD_I16BE");
-                            } else if (obj==H5T_STD_I16LE_g) {
+                            else if(obj == H5T_STD_I16LE_g)
                                 fprintf(out, "H5T_STD_I16LE");
-                            } else if (obj==H5T_STD_I32BE_g) {
+                            else if(obj == H5T_STD_I32BE_g)
                                 fprintf(out, "H5T_STD_I32BE");
-                            } else if (obj==H5T_STD_I32LE_g) {
+                            else if(obj == H5T_STD_I32LE_g)
                                 fprintf(out, "H5T_STD_I32LE");
-                            } else if (obj==H5T_STD_I64BE_g) {
+                            else if(obj == H5T_STD_I64BE_g)
                                 fprintf(out, "H5T_STD_I64BE");
-                            } else if (obj==H5T_STD_I64LE_g) {
+                            else if(obj == H5T_STD_I64LE_g)
                                 fprintf(out, "H5T_STD_I64LE");
-                            } else if (obj==H5T_STD_U8BE_g) {
+                            else if(obj == H5T_STD_U8BE_g)
                                 fprintf(out, "H5T_STD_U8BE");
-                            } else if (obj==H5T_STD_U8LE_g) {
+                            else if(obj == H5T_STD_U8LE_g)
                                 fprintf(out, "H5T_STD_U8LE");
-                            } else if (obj==H5T_STD_U16BE_g) {
+                            else if(obj == H5T_STD_U16BE_g)
                                 fprintf(out, "H5T_STD_U16BE");
-                            } else if (obj==H5T_STD_U16LE_g) {
+                            else if(obj == H5T_STD_U16LE_g)
                                 fprintf(out, "H5T_STD_U16LE");
-                            } else if (obj==H5T_STD_U32BE_g) {
+                            else if(obj == H5T_STD_U32BE_g)
                                 fprintf(out, "H5T_STD_U32BE");
-                            } else if (obj==H5T_STD_U32LE_g) {
+                            else if(obj == H5T_STD_U32LE_g)
                                 fprintf(out, "H5T_STD_U32LE");
-                            } else if (obj==H5T_STD_U64BE_g) {
+                            else if(obj == H5T_STD_U64BE_g)
                                 fprintf(out, "H5T_STD_U64BE");
-                            } else if (obj==H5T_STD_U64LE_g) {
+                            else if(obj == H5T_STD_U64LE_g)
                                 fprintf(out, "H5T_STD_U64LE");
-                            } else if (obj==H5T_STD_B8BE_g) {
+                            else if(obj == H5T_STD_B8BE_g)
                                 fprintf(out, "H5T_STD_B8BE");
-                            } else if (obj==H5T_STD_B8LE_g) {
+                            else if(obj == H5T_STD_B8LE_g)
                                 fprintf(out, "H5T_STD_B8LE");
-                            } else if (obj==H5T_STD_B16BE_g) {
+                            else if(obj == H5T_STD_B16BE_g)
                                 fprintf(out, "H5T_STD_B16BE");
-                            } else if (obj==H5T_STD_B16LE_g) {
+                            else if(obj == H5T_STD_B16LE_g)
                                 fprintf(out, "H5T_STD_B16LE");
-                            } else if (obj==H5T_STD_B32BE_g) {
+                            else if(obj == H5T_STD_B32BE_g)
                                 fprintf(out, "H5T_STD_B32BE");
-                            } else if (obj==H5T_STD_B32LE_g) {
+                            else if(obj == H5T_STD_B32LE_g)
                                 fprintf(out, "H5T_STD_B32LE");
-                            } else if (obj==H5T_STD_B64BE_g) {
+                            else if(obj == H5T_STD_B64BE_g)
                                 fprintf(out, "H5T_STD_B64BE");
-                            } else if (obj==H5T_STD_B64LE_g) {
+                            else if(obj == H5T_STD_B64LE_g)
                                 fprintf(out, "H5T_STD_B64LE");
-                            } else if (obj==H5T_C_S1_g) {
+                            else if(obj == H5T_C_S1_g)
                                 fprintf(out, "H5T_C_S1");
-                            } else if (obj==H5T_FORTRAN_S1_g) {
+                            else if(obj == H5T_FORTRAN_S1_g)
                                 fprintf(out, "H5T_FORTRAN_S1");
-                            } else {
+                            else
                                 fprintf(out, "%ld (dtype)", (long)obj);
-                            }
                             break;
+
                         case H5I_DATASPACE:
                             fprintf(out, "%ld (dspace)", (long)obj);
                             /* Save the rank of simple data spaces for arrays */
                             /* This may generate recursive call to the library... -QAK */
                             {
-                                H5S_t *space = (H5S_t *)H5I_object(obj);
-                                if (H5S_SIMPLE==H5S_GET_EXTENT_TYPE(space)) {
-                                    asize[argno] = H5S_GET_EXTENT_NDIMS(space);
-                                }
+                                H5S_t *space;
+
+                                if(NULL != (space = (H5S_t *)H5I_object(obj)))
+                                    if(H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space))
+                                        asize[argno] = H5S_GET_EXTENT_NDIMS(space);
                             }
                             break;
+
                         case H5I_DATASET:
                             fprintf(out, "%ld (dset)", (long)obj);
                             break;
+
                         case H5I_ATTR:
                             fprintf(out, "%ld (attr)", (long)obj);
                             break;
+
                         case H5I_REFERENCE:
                             fprintf(out, "%ld (reference)", (long)obj);
                             break;
+
                         case H5I_VFL:
                             fprintf(out, "%ld (file driver)", (long)obj);
                             break;
+
                         case H5I_GENPROP_CLS:
                             fprintf(out, "%ld (genprop class)", (long)obj);
                             break;
+
                         case H5I_GENPROP_LST:
                             fprintf(out, "%ld (genprop list)", (long)obj);
                             break;
+
                         case H5I_ERROR_CLASS:
                             fprintf(out, "%ld (err class)", (long)obj);
                             break;
+
                         case H5I_ERROR_MSG:
                             fprintf(out, "%ld (err msg)", (long)obj);
                             break;
+
                         case H5I_ERROR_STACK:
                             fprintf(out, "%ld (err stack)", (long)obj);
                             break;
+
                         case H5I_NTYPES:
                             fprintf (out, "%ld (ntypes - error)", (long)obj);
                             break;
+
                         default:
                             fprintf(out, "%ld (unknown class)", (long)obj);
                             break;
-		    }
-		}
-	    }
+		    } /* end switch */
+		} /* end else */
+	    } /* end else */
 	    break;
 
 	case 'I':