[svn-r435] ./INSTALL

./INSTALL_MAINT
./README
./RELEASE
	Partially updated for second alpha, but haven't updated
	version numbers yet.

./src/H5.c
./src/H5A.c
./src/H5AC.c
./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Fmpio.c
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5I.c
./src/H5MM.c
./src/H5MMprivate.h
./src/H5O.c
./src/H5Oattr.c
./src/H5Ocomp.c
./src/H5Ocont.c
./src/H5Odtype.c
./src/H5Oefl.c
./src/H5Olayout.c
./src/H5Oname.c
./src/H5Osdspace.c
./src/H5Oshared.c
./src/H5Ostab.c
./src/H5P.c
./src/H5S.c
./src/H5T.c
./src/H5Tconv.c
./src/H5detect.c
./test/hyperslab.c
./test/istore.c
	Changed memory allocation functions so they fail instead of
	dumping core.  The `x' was removed from the name to remind us
	of that: H5MM_xmalloc() -> H5MM_malloc(), etc.

	H5MM_calloc() takes one argument like H5MM_malloc() instead of
	two like calloc() because we almost always called it with `1'
	for one of the arguments anyway.  The only difference between
	the two functions is that H5MM_calloc() returns memory which
	is initialized to zero.

./src/H5Gent.c
./src/H5Gprivate.h
	Removed H5G_ent_calloc() since it wasn't used.

./src/H5Fistore.c
	Fixed a bug found by Albert.  Thanks, Albert!  This fix
	combined with the changes to memory allocation prevent the
	library from failing an assertion if the application uses an
	unreasonable size for chunks (like Alberts 10000x10000x4).

./src/H5MF.c
./src/H5MFprivate.h
	Changed H5MF_free() to H5MF_xfree() since calling it with an
	undefined address is allowed.

1 files changed, 21 insertions, 10 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 6065d5d..e209993 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -496,25 +496,29 @@ H5Fis_hdf5 (const char *filename)
 static H5F_t *
 H5F_new(H5F_file_t *shared, const H5F_create_t *fcpl, const H5F_access_t *fapl)
 {
-    H5F_t		*f = NULL;
+    H5F_t		*f=NULL, *ret_value=NULL;
     intn		n;
     
     FUNC_ENTER(H5F_new, NULL);
 
-    f = H5MM_xcalloc(1, sizeof(H5F_t));
-    f->shared = shared;
+    if (NULL==(f = H5MM_calloc(sizeof(H5F_t)))) {
+	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,
+		     "memory allocation failed");
+    }
 
-    if (!f->shared) {
-	f->shared = H5MM_xcalloc(1, sizeof(H5F_file_t));
+    if (shared) {
+	f->shared = shared;
+    } else {
+	f->shared = H5MM_calloc(sizeof(H5F_file_t));
 	H5F_addr_undef(&(f->shared->boot_addr));
 	H5F_addr_undef(&(f->shared->base_addr));
 	H5F_addr_undef(&(f->shared->freespace_addr));
 	H5F_addr_undef(&(f->shared->hdf5_eof));
-
+    
 	/*
-	 * Deep-copy the file creation and file access property lists into
-	 * the new file handle.  We do this early because some values might
-	 * need to change as the file is being opened.
+	 * Deep-copy the file creation and file access property lists into the
+	 * new file handle.  We do this early because some values might need
+	 * to change as the file is being opened.
 	 */
 	if (NULL==(f->shared->create_parms=H5P_copy(H5P_FILE_CREATE, fcpl))) {
 	    HRETURN_ERROR (H5E_FILE, H5E_CANTINIT, NULL,
@@ -540,8 +544,15 @@ H5F_new(H5F_file_t *shared, const H5F_create_t *fcpl, const H5F_access_t *fapl)
 	H5F_istore_init (f);
     }
     f->shared->nrefs++;
+    ret_value = f;
 
-    FUNC_LEAVE(f);
+ done:
+    if (!ret_value && f) {
+	if (!shared) H5MM_xfree (f->shared);
+	H5MM_xfree (f);
+    }
+    
+    FUNC_LEAVE(ret_value);
 }