[svn-r18300] Description:

    Bring Coverity fixes from branch to trunk:

r18282:
   Fix Coverity issue #428 by wrapping testing calls with if(pass) {} block.

r18283:
   Fix Coverity issue #425 by wrapping test calls in if(pass) {} block

r18284:
Issue 166:  init_error() malloc'd 3 pointers in initialization and never freed 
inc ase of errors. Init pointers to NULL, check allocation results and free
allocations in error block

r18285:
   Fix Coverity issue #410 by wrapping test calls with if(pass) {} block.

r18286:
Issue 165:  custom_print_cb() needed allocations freed in error block.

r18287:
Fix coverity issue # 409

Added if (pass) checks around calls to flush_cache. Additionally, 
added a check for file_ptr = NULL after call to setup_cache.

r18288:
Fix coverity# 107 free fh in H5HF_close() correctly before exit the function
even when failure occurs.

r18289:
   Fix Coverity issue #429: correct failure return values to match return type
from routine.

r18290:
   Fix Coverity issue #103: release allocated indirect section  on error

r18294:
Issue 153, 152:  Check allocations and free allocations in error block. Also
cleaned up hid_t identifer that were opened in error block.

r18295:
Fix coverity# 101 free new_loc in H5HF_man_iter_start_entry() correctly before
exit the function even when failure occurs

r18296:
Fix coverity# 100 free down_loc in H5HF_man_iter_down() before exit the function
when failure occurs

r18297:
Fixed coverity issues 54, 55 and 216.  Correctly handle the various ways that
allocation of attr_name can fail in test_attr_basic_write.

r18298:
Fix coverity# 119 free object in H5HG_read() before exit the function when
failure occurs

r18299:
Fix coverity issue #112:

Add cleanup during error handling of H5MP_create.


Tested on:
    Mac OS X/32 10.6.2 (amazon) w/debug & production
    Misc. Linux configurations (on original checkins)

1 files changed, 13 insertions, 6 deletions

diff --git a/test/err_compat.c b/test/err_compat.c
index 33c172f..be86a2d 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -186,10 +186,10 @@ dump_error(void)
 herr_t
 custom_print_cb(int n, H5E_error1_t *err_desc, void* client_data)
 {
-    FILE		*stream  = (FILE *)client_data;
-    char                *maj;
-    char                *min;
-    const int		indent = 4;
+    FILE	*stream  = (FILE *)client_data;
+    char        *maj = NULL;
+    char        *min = NULL;
+    const int	 indent = 4;
 
     if(NULL == (min = H5Eget_minor(err_desc->min_num)))
         TEST_ERROR;
@@ -200,14 +200,21 @@ custom_print_cb(int n, H5E_error1_t *err_desc, void* client_data)
     fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n",
 	     indent, "", n, err_desc->file_name,
 	     err_desc->func_name, err_desc->line);
-    fprintf(stream, "%*smajor: %s\n", indent*2, "", maj);
+    
+    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+
     HDfree(maj);
-    fprintf (stream, "%*sminor: %s\n", indent*2, "", min);
     HDfree(min);
 
     return 0;
 
 error:
+    if(maj)
+        HDfree(maj);
+    if(min)
+        HDfree(min);
+    
     return -1;
 }