[svn-r18032] Description:

	Bring r18031 from trunk to 1.8 branch:

	Bring r18030 from merge_metadata_journaling branch to trunk:

	Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.

	Also, some other minor cleanups along the way.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
	(h5committested on trunk)

1 files changed, 11 insertions, 0 deletions

diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index 10d2637..3d16db5 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -214,6 +214,11 @@ out:
  *
  * Modifications:
  *
+ * 		John Mainzer -- 4/23/08
+ * 		Added error check on malloc of table, initialized fields 
+ * 		in table to keep lower level code from choking on bogus 
+ * 		data in error cases.
+ *
  *-------------------------------------------------------------------------
  */
 hid_t H5PTopen( hid_t loc_id,
@@ -232,6 +237,12 @@ hid_t H5PTopen( hid_t loc_id,
 
   table = (htbl_t *)malloc(sizeof(htbl_t));
 
+  if ( table == NULL ) {
+    goto out;
+  }
+  table->dset_id = H5I_BADID;
+  table->type_id = H5I_BADID;
+
   /* Open the dataset */
   if((table->dset_id = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
       goto out;